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

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNihad Abbasov <narkoz.2008@gmail.com>2012-07-06 10:50:24 +0400
committerNihad Abbasov <narkoz.2008@gmail.com>2012-07-06 10:50:24 +0400
commit2abd054b0c3c3f1116840cf51444fc63e49057f6 (patch)
treeeb372bdd01a68ff2405166230e63cf253710973f /Gemfile.lock
parent7f207d4a872cb55d302608a2739e94fc59ef1ff1 (diff)
update devise
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock13
1 files changed, 7 insertions, 6 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index e6a488f2753..e4c06fed229 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -148,10 +148,11 @@ GEM
nokogiri (>= 1.5.0)
daemons (1.1.8)
database_cleaner (0.8.0)
- devise (1.5.3)
+ devise (2.1.2)
bcrypt-ruby (~> 3.0)
- orm_adapter (~> 0.0.3)
- warden (~> 1.1)
+ orm_adapter (~> 0.1)
+ railties (~> 3.1)
+ warden (~> 1.2.1)
diff-lcs (1.1.3)
drapper (0.8.4)
email_spec (1.2.1)
@@ -225,7 +226,7 @@ GEM
omniauth (1.1.0)
hashie (~> 1.2)
rack
- orm_adapter (0.0.7)
+ orm_adapter (0.3.0)
polyglot (0.3.3)
posix-spawn (0.3.6)
pry (0.9.9.6)
@@ -356,7 +357,7 @@ GEM
raindrops (~> 0.7)
vegas (0.1.11)
rack (>= 1.0.0)
- warden (1.2.0)
+ warden (1.2.1)
rack (>= 1.0)
webmock (1.8.7)
addressable (>= 2.2.7)
@@ -383,7 +384,7 @@ DEPENDENCIES
colored
cucumber-rails
database_cleaner
- devise (~> 1.5)
+ devise (~> 2.1.0)
drapper
email_spec
ffaker