diff options
| -rw-r--r-- | Gemfile | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 24 |
2 files changed, 14 insertions, 14 deletions
@@ -6,8 +6,8 @@ require File.expand_path('../lib/gemfile_tools.rb', __FILE__) # rake 11.x throws lots of warnings about rails 3.2 code gem "rake" gem "rails", "~> 4.2.6" -gem "couchrest", "~> 1.1.3" -gem "couchrest_model", "~> 2.0.0" +gem "couchrest", "~> 2.0.0.rc3" +gem "couchrest_model", "~> 2.1.0.beta2" if ARGV.grep(/assets:precompile/).empty? gem "couchrest_session_store", "~> 0.4.1" end diff --git a/Gemfile.lock b/Gemfile.lock index 3344b5c..0d18875 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -95,14 +95,13 @@ GEM cliver (0.3.2) coderay (1.1.1) concurrent-ruby (1.0.1) - couchrest (1.1.3) - mime-types (~> 1.15) - multi_json (~> 1.0) - rest-client (~> 1.6.1) - couchrest_model (2.0.1) - activemodel (>= 3.0) - couchrest (~> 1.1.3) + couchrest (2.0.0.rc3) + httpclient (~> 2.7) mime-types (>= 1.15) + multi_json (~> 1.7) + couchrest_model (2.1.0.beta2) + activemodel (~> 4.0) + couchrest (= 2.0.0.rc3) tzinfo (>= 0.3.22) couchrest_session_store (0.4.1) actionpack (~> 4.0) @@ -161,6 +160,7 @@ GEM nokogiri (~> 1.6.0) ruby_parser (~> 3.5) http_accept_language (2.0.5) + httpclient (2.8.0) i18n (0.7.0) i18n-missing_translations (0.0.1) jquery-rails (4.1.1) @@ -182,7 +182,9 @@ GEM mime-types (>= 1.16, < 4) metaclass (0.0.4) method_source (0.8.2) - mime-types (1.25.1) + mime-types (3.0) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0221) mini_portile2 (2.0.0) minitest (5.8.4) minitest-stub-const (0.5) @@ -243,8 +245,6 @@ GEM rdiscount (2.1.8) ref (2.0.0) regexp_parser (0.3.3) - rest-client (1.6.9) - mime-types (~> 1.16) ruby-srp (0.2.1) ruby_parser (3.8.1) sexp_processor (~> 4.1) @@ -312,8 +312,8 @@ DEPENDENCIES client_side_validations client_side_validations-simple_form common_languages! - couchrest (~> 1.1.3) - couchrest_model (~> 2.0.0) + couchrest (~> 2.0.0.rc3) + couchrest_model (~> 2.1.0.beta2) couchrest_session_store (~> 0.4.1) cucumber-rails factory_girl_rails |