summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAzul <azul@riseup.net>2016-05-02 21:16:36 -0300
committerAzul <azul@riseup.net>2016-05-02 21:16:36 -0300
commitc9f24739664e9d4f7bcdafa87c7d53a5f339cbae (patch)
treec64929e2f1f30bf7305ad30a3dd6767cbe65c5be
parent6117518350847e83e5b0e79cb206b03ff99d6ee2 (diff)
upgrade: couchrest_session_store 0.4.2
Uses the latest couchrest and couchrest_model. Also fixes issues with ruby 2.1
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock16
2 files changed, 5 insertions, 13 deletions
diff --git a/Gemfile b/Gemfile
index 0df9357..f327281 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,7 +11,7 @@ gem 'responders', '~> 2.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"
+ gem "couchrest_session_store", "~> 0.4.2"
end
## AUTHENTICATION
diff --git a/Gemfile.lock b/Gemfile.lock
index bd41a09..e0dc859 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -22,14 +22,6 @@ PATH
common_languages (0.0.1)
i18n
-PATH
- remote: vendor/gems/couchrest_session_store
- specs:
- couchrest_session_store (0.4.0)
- actionpack (~> 4.0)
- couchrest
- couchrest_model
-
GEM
remote: https://rubygems.org/
specs:
@@ -111,10 +103,10 @@ GEM
activemodel (~> 4.0)
couchrest (= 2.0.0.rc3)
tzinfo (>= 0.3.22)
- couchrest_session_store (0.4.1)
+ couchrest_session_store (0.4.2)
actionpack (~> 4.0)
- couchrest
- couchrest_model
+ couchrest (~> 2.0.0.rc3)
+ couchrest_model (~> 2.1.0.beta2)
cucumber (2.3.3)
builder (>= 2.1.2)
cucumber-core (~> 1.4.0)
@@ -322,7 +314,7 @@ DEPENDENCIES
common_languages!
couchrest (~> 2.0.0.rc3)
couchrest_model (~> 2.1.0.beta2)
- couchrest_session_store (~> 0.4.1)
+ couchrest_session_store (~> 0.4.2)
cucumber-rails
factory_girl_rails
fake_braintree