diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-11 04:37:56 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-11 04:37:56 +0300 |
| commit | 3a82302fcbe938f5ee20f88272a8d8fefa879c7e (patch) | |
| tree | 0e36331c72cd044ae4d186cca77c074389834695 /Gemfile | |
| parent | e2b6a4621ba41b412403ee1b4e081dc90611804f (diff) | |
| parent | 7f1b60cc66d27d1596b881884734532cdc62efd7 (diff) | |
Merge branch 'bump-devise-3.5.3' into 'master'
Bump devise to 3.5.3 to fix reset token expiring after account creation
Also fixes an incorrect redirect after login with relative URL root:
Closes https://github.com/gitlabhq/gitlabhq/issues/8228
Closes #2750
See merge request !2056
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -18,7 +18,7 @@ gem "mysql2", '~> 0.3.16', group: :mysql gem "pg", '~> 0.18.2', group: :postgres # Authentication libraries -gem 'devise', '~> 3.5.2' +gem 'devise', '~> 3.5.3' gem 'devise-async', '~> 0.9.0' gem 'doorkeeper', '~> 2.2.0' gem 'omniauth', '~> 1.2.2' |