diff options
| author | Marin Jankovski <marin@gitlab.com> | 2014-07-09 13:17:45 +0200 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2014-07-09 13:22:32 +0200 |
| commit | 34cfd84ed253dbee59c3097b0d10d9ed112cac58 (patch) | |
| tree | 7448d10bf27f1631e11929aa17f5a8365adc49e5 /Gemfile.lock | |
| parent | 47d5ef4bd54ac493a35d190d0909059b6e35c0fe (diff) | |
| download | gitlab-ce-34cfd84ed253dbee59c3097b0d10d9ed112cac58.tar.gz | |
Upgrade to devise 3.2.4
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index d5898dbdf6f..97d3d8bab64 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -40,7 +40,7 @@ GEM axiom-types (0.0.5) descendants_tracker (~> 0.0.1) ice_nine (~> 0.9) - bcrypt-ruby (3.1.2) + bcrypt (3.1.7) better_errors (1.0.1) coderay (>= 1.0.0) erubis (>= 2.6.6) @@ -94,13 +94,14 @@ GEM default_value_for (3.0.0) activerecord (>= 3.2.0, < 5.0) descendants_tracker (0.0.3) - devise (3.0.4) - bcrypt-ruby (~> 3.0) + devise (3.2.4) + bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 3.2.6, < 5) + thread_safe (~> 0.1) warden (~> 1.2.3) - devise-async (0.8.0) - devise (>= 2.2, < 3.2) + devise-async (0.9.0) + devise (~> 3.2) diff-lcs (1.2.5) diffy (3.0.3) docile (1.1.1) @@ -584,8 +585,8 @@ DEPENDENCIES d3_rails (~> 3.1.4) database_cleaner default_value_for (~> 3.0.0) - devise (= 3.0.4) - devise-async (= 0.8.0) + devise (= 3.2.4) + devise-async (= 0.9.0) diffy (~> 3.0.3) dropzonejs-rails email_spec |