diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-11 01:37:56 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-11 01:37:56 +0000 |
| commit | 3a82302fcbe938f5ee20f88272a8d8fefa879c7e (patch) | |
| tree | 0e36331c72cd044ae4d186cca77c074389834695 /CHANGELOG | |
| parent | e2b6a4621ba41b412403ee1b4e081dc90611804f (diff) | |
| parent | 7f1b60cc66d27d1596b881884734532cdc62efd7 (diff) | |
| download | gitlab-ce-3a82302fcbe938f5ee20f88272a8d8fefa879c7e.tar.gz | |
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 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 2bde388d0fb..1cc780ae729 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) |