diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-09-29 12:28:18 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-09-29 12:28:18 +0000 |
| commit | 570ae33656f24299ca4bb589d0e7043bd120c7a3 (patch) | |
| tree | d21c4988ddea744aff9c8dbbd2c7e1d76b3fa7a7 /Gemfile.lock | |
| parent | ce0591df704028c467dbb34c1521347c3b8c7cda (diff) | |
| parent | e13dc69be271e57fe9cc1a3cbf0f7a86d735b2c6 (diff) | |
| download | gitlab-ce-570ae33656f24299ca4bb589d0e7043bd120c7a3.tar.gz | |
Merge branch 'cs-upgrade-devise' into 'master'
Upgrade Devise from 4.1.1 to 4.2.0.
This fixes an issue with Rails 5 and brings us up-to-date with the latest Devise release. It also deprecates `Devise::TestHelpers` in favor of `Devise::Test::ControllerHelpers`.
Changelog: https://github.com/plataformatec/devise/blob/v4.2.0/CHANGELOG.md#420---2016-07-01
Working toward #14286, as always.
See merge request !6461
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 2b8f28f3ebe..6f6667b51e9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -161,7 +161,7 @@ GEM activerecord (>= 3.2.0, < 5.1) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - devise (4.1.1) + devise (4.2.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0, < 5.1) @@ -584,7 +584,7 @@ GEM request_store (1.3.1) rerun (0.11.0) listen (~> 3.0) - responders (2.1.1) + responders (2.3.0) railties (>= 4.2.0, < 5.1) rinku (2.0.0) rotp (2.1.2) @@ -832,7 +832,7 @@ DEPENDENCIES d3_rails (~> 3.5.0) database_cleaner (~> 1.5.0) default_value_for (~> 3.0.0) - devise (~> 4.0) + devise (~> 4.2) devise-two-factor (~> 3.0.0) diffy (~> 3.0.3) doorkeeper (~> 4.2.0) |