update gemfiles

next-l · Aug 12, 2016 · 20c6705 · 20c6705
1 parent 5995d8f
commit 20c6705
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 27 deletions.
diff --git a/Gemfile b/Gemfile
@@ -9,6 +9,8 @@ gemspec
 # your gemspec. These might include edge Rails or gems from your path or
 # Git. Remember to move these dependencies to your gemspec before releasing
 # your gem to rubygems.org.
+gem 'enju_leaf', github: 'next-l/enju_leaf', branch: '1.2'
+gem 'enju_seed', github: 'next-l/enju_seed', branch: '1.2'
 
 # To use debugger
 # gem 'debugger'
diff --git a/enju_loc.gemspec b/enju_loc.gemspec
@@ -20,9 +20,8 @@ Gem::Specification.new do |s|
   s.add_dependency "faraday"
 
   s.add_development_dependency "enju_leaf", "~> 1.2.0.beta.1"
-  s.add_development_dependency "enju_library", "~> 0.2.0.beta.1"
+  s.add_development_dependency "enju_library", "~> 0.2.0.beta.2"
   s.add_development_dependency "enju_biblio", "~> 0.2.0.beta.1"
-  s.add_development_dependency "enju_manifestation_viewer", "~> 0.2.0.beta.1"
   s.add_development_dependency "enju_subject", "~> 0.2.0.beta.1"
   s.add_development_dependency "sqlite3"
   s.add_development_dependency "mysql2"

diff --git a/gemfiles/rails_3.2.gemfile b/gemfiles/rails_3.2.gemfile
diff --git a/gemfiles/rails_4.1.gemfile b/gemfiles/rails_4.1.gemfile
diff --git a/gemfiles/rails_4.2.gemfile b/gemfiles/rails_4.2.gemfile
@@ -2,6 +2,8 @@
 
 source "https://rubygems.org"
 
+gem "enju_leaf", :github => "next-l/enju_leaf", :branch => "1.2"
+gem "enju_seed", :github => "next-l/enju_seed", :branch => "1.2"
 gem "rails", "~> 4.2.7"
 gem "jquery-rails"
 

diff --git a/gemfiles/rails_4.2_ndl.gemfile b/gemfiles/rails_4.2_ndl.gemfile
@@ -2,6 +2,8 @@
 
 source "https://rubygems.org"
 
+gem "enju_leaf", :github => "next-l/enju_leaf", :branch => "1.2"
+gem "enju_seed", :github => "next-l/enju_seed", :branch => "1.2"
 gem "rails", "~> 4.2.7"
 gem "jquery-rails"
 gem "enju_ndl", "~> 0.2.0.beta.1"

diff --git a/gemfiles/rails_4.2_nii.gemfile b/gemfiles/rails_4.2_nii.gemfile
@@ -2,6 +2,8 @@
 
 source "https://rubygems.org"
 
+gem "enju_leaf", :github => "next-l/enju_leaf", :branch => "1.2"
+gem "enju_seed", :github => "next-l/enju_seed", :branch => "1.2"
 gem "rails", "~> 4.2.7"
 gem "jquery-rails"
 gem "enju_nii", "~> 0.2.0.beta.1"

diff --git a/spec/dummy/app/controllers/application_controller.rb b/spec/dummy/app/controllers/application_controller.rb
@@ -1,8 +1,7 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
-  include EnjuLeaf::Controller
-  include EnjuBiblio::Controller
   include EnjuLibrary::Controller
+  include EnjuBiblio::Controller
   include EnjuSubject::Controller
   before_action :set_paper_trail_whodunnit
   after_action :verify_authorized