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 | |
| 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')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -17,7 +17,7 @@ gem 'mysql2', '~> 0.3.16', group: :mysql gem 'pg', '~> 0.18.2', group: :postgres # Authentication libraries -gem 'devise', '~> 4.0' +gem 'devise', '~> 4.2' gem 'doorkeeper', '~> 4.2.0' gem 'omniauth', '~> 1.3.1' gem 'omniauth-auth0', '~> 1.4.1' |