summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorjessib <jessib@riseup.net>2013-12-16 09:41:38 -0800
committerjessib <jessib@riseup.net>2013-12-16 09:41:38 -0800
commitdbb4030c87872550e03d1252ce2258f7cb1da6d9 (patch)
tree2028ea1c0aaf34d57834d39d44a4ffd314fb1a16 /Gemfile.lock
parente1d9d92d4afe32a6b4c267d9ffb7d8a40c4871e1 (diff)
parent72087656e5092fd744f4314c9a0e91825399fefc (diff)
Merge pull request #121 from azul/feature/robust-against-couch-connection-issues
Feature/robust against couch connection issues
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock10
1 files changed, 5 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index d1fd014..918fdba 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -25,7 +25,7 @@ PATH
leap_web_core (0.2.8)
couchrest (~> 1.1.3)
couchrest_model (~> 2.0.0)
- couchrest_session_store (~> 0.2.2)
+ couchrest_session_store (~> 0.2.4)
json
rails (~> 3.2.11)
@@ -105,12 +105,12 @@ GEM
mime-types (~> 1.15)
multi_json (~> 1.0)
rest-client (~> 1.6.1)
- couchrest_model (2.0.0)
+ couchrest_model (2.0.1)
activemodel (>= 3.0)
couchrest (~> 1.1.3)
mime-types (>= 1.15)
tzinfo (>= 0.3.22)
- couchrest_session_store (0.2.2)
+ couchrest_session_store (0.2.4)
actionpack
couchrest
couchrest_model
@@ -145,7 +145,7 @@ GEM
haml (~> 3.1)
railties (>= 3.1, < 4.1)
hike (1.2.3)
- i18n (0.6.5)
+ i18n (0.6.9)
journey (1.0.4)
jquery-rails (3.0.4)
railties (>= 3.0, < 5.0)
@@ -162,7 +162,7 @@ GEM
mime-types (~> 1.16)
treetop (~> 1.4.8)
metaclass (0.0.1)
- mime-types (1.25)
+ mime-types (1.25.1)
mini_portile (0.5.1)
mocha (0.13.3)
metaclass (~> 0.0.1)