Merge branch '1.1' of github.com:next-l/enju_loc into 1.1

next-l · Apr 22, 2015 · 52be501 · 52be501
2 parents 0477e53 + 3bd9c81
commit 52be501
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,7 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.5
-  - 2.2.0
+  - 2.2.1
 before_script:
   - mysql -e 'create database enju_test'
   - psql -c 'create database enju_test;' -U postgres
@@ -31,7 +31,7 @@ matrix:
     gemfile: gemfiles/rails4_2.gemfile
   - rvm: 2.1.5
     gemfile: gemfiles/rails3_2.gemfile
-  - rvm: 2.2.0
+  - rvm: 2.2.1
     gemfile: gemfiles/rails3_2.gemfile
 notifications:
   slack:

diff --git a/enju_loc.gemspec b/enju_loc.gemspec
@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "vcr"
   s.add_development_dependency "webmock"
   s.add_development_dependency "enju_leaf", "~> 1.1.0.rc17"
-  s.add_development_dependency "sunspot_solr", "~> 2.1"
+  s.add_development_dependency "sunspot_solr", "~> 2.2"
   s.add_development_dependency "simplecov"
   s.add_development_dependency "enju_subject", "~> 0.1.0.pre29"
 end
diff --git a/gemfiles/rails4_1.gemfile b/gemfiles/rails4_1.gemfile
@@ -1,7 +1,8 @@
 source "https://rubygems.org"
 
-gem "rails", "~> 4.1.9"
+gem "rails", "~> 4.1.10"
 gem "jquery-rails"
+gem "statesman", "~> 1.2"
 gem "coveralls", require: false
 
 gemspec path: "../"
diff --git a/gemfiles/rails4_2.gemfile b/gemfiles/rails4_2.gemfile
@@ -1,8 +1,8 @@
 source "https://rubygems.org"
 
-gem "rails", "~> 4.2.0"
+gem "rails", "~> 4.2.1"
 gem "jquery-rails"
-gem "statesman", "~> 1.1"
+gem "statesman", "~> 1.2"
 gem "coveralls", require: false
 
 gemspec path: "../"