Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaphael Sofaer <raphael@joindiaspora.com>2011-05-17 02:54:18 +0400
committerRaphael Sofaer <raphael@joindiaspora.com>2011-05-17 02:54:18 +0400
commit495dd89dd2a734a8fdf0992c990669eb75b97d57 (patch)
treeeac7c869816cd0b5ad35f33b641e6df855320e28 /Gemfile.lock
parent8c1e64a080ea78e23ad4263b2558b62bbe4d4314 (diff)
Fix password reset, add cucumber feature
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 4c14681c6..db08a1db0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -158,7 +158,7 @@ GEM
culerity (0.2.15)
daemons (1.1.2)
database_cleaner (0.6.0)
- devise (1.3.1)
+ devise (1.3.4)
bcrypt-ruby (~> 2.1.2)
orm_adapter (~> 0.0.3)
warden (~> 1.0.3)
@@ -415,7 +415,7 @@ DEPENDENCIES
cloudfiles (= 1.4.10)
cucumber-rails (= 0.3.2)
database_cleaner (= 0.6.0)
- devise (= 1.3.1)
+ devise (~> 1.3.1)
devise_invitable (= 0.5.0)
em-websocket!
excon (= 0.2.4)