diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-12-10 09:02:57 -0800 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-12-10 11:37:37 -0800 |
| commit | 7f1b60cc66d27d1596b881884734532cdc62efd7 (patch) | |
| tree | a257d0927d46e33c015f09e7256ceb615bde889e | |
| parent | 0d65f09ff1d98e9474a0f441aa7ced04336a04f9 (diff) | |
| download | gitlab-ce-7f1b60cc66d27d1596b881884734532cdc62efd7.tar.gz | |
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
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG index 2fa1dac3463..2078e2dc67d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,6 +4,7 @@ v 8.3.0 (unreleased) - Add button to automatically merge a merge request when the build succeeds (Zeger-Jan van de Weg) - Merge when build succeeds (Zeger-Jan van de Weg) - Provide better diagnostic message upon project creation errors (Stan Hu) + - Bump devise to 3.5.3 to fix reset token expiring after account creation (Stan Hu) - Bump gollum-lib to 4.1.0 (Stan Hu) - Fix broken group avatar upload under "New group" (Stan Hu) - Update project repositorize size and commit count during import:repos task (Stan Hu) @@ -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' diff --git a/Gemfile.lock b/Gemfile.lock index 37ba22b7ceb..c3d7536b6c6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -168,7 +168,7 @@ GEM activerecord (>= 3.2.0, < 5.0) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - devise (3.5.2) + devise (3.5.3) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 3.2.6, < 5) @@ -858,7 +858,7 @@ DEPENDENCIES d3_rails (~> 3.5.5) database_cleaner (~> 1.4.0) default_value_for (~> 3.0.0) - devise (~> 3.5.2) + devise (~> 3.5.3) devise-async (~> 0.9.0) devise-two-factor (~> 2.0.0) diffy (~> 3.0.3) |