diff options
| author | Stan Hu <stanhu@gmail.com> | 2015-08-07 17:28:41 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2015-08-07 17:28:41 +0000 |
| commit | 59c486dcc1b46af62f8c526c9aea6a9c615fd914 (patch) | |
| tree | 5757ad7f76d9dee6ffd232a3dc254aac4f0d6744 | |
| parent | 0c3170193277320aa2be287b2f5cb7ccac7b4cdf (diff) | |
| parent | 1681fd7b6e9319ca4718f57d16a3d93cb6fa98dc (diff) | |
| download | gitlab-ce-59c486dcc1b46af62f8c526c9aea6a9c615fd914.tar.gz | |
Merge branch 'fix-changelog-versions' into 'master'
Fix CHANGELOG entries to belong in the right version
Reorder entries that were improperly grouped (one fix mentioned in #1522).
See merge request !1118
| -rw-r--r-- | CHANGELOG | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/CHANGELOG b/CHANGELOG index b7a173e8267..c5e3e4518b9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -22,6 +22,7 @@ v 7.14.0 (unreleased) - Fix OAuth provider bug where GitLab would not go return to the redirect_uri after sign-in (Stan Hu) - Fix file upload dialog for comment editing (Daniel Gerhardt) - Set OmniAuth full_host parameter to ensure redirect URIs are correct (Stan Hu) + - Return comments in created order in merge request API (Stan Hu) - Expire Rails cache entries after two weeks to prevent endless Redis growth - Add support for destroying project milestones (Stan Hu) - Add fetch command to the MR page. @@ -39,7 +40,7 @@ v 7.14.0 (unreleased) - Remove redis-store TTL monkey patch - Add support for CI skipped status - Fetch code from forks to refs/merge-requests/:id/head when merge request created - - Remove satellites + - Remove satellites - Remove comments and email addresses when publicly exposing ssh keys (Zeger-Jan van de Weg) v 7.13.3 @@ -69,9 +70,6 @@ v 7.13.1 v 7.13.0 - Remove repository graph log to fix slow cache updates after push event (Stan Hu) - - Return comments in created order in merge request API (Stan Hu) - -v 7.13.0 (unreleased) - Only enable HSTS header for HTTPS and port 443 (Stan Hu) - Fix user autocomplete for unauthenticated users accessing public projects (Stan Hu) - Fix redirection to home page URL for unauthorized users (Daniel Gerhardt) @@ -119,12 +117,12 @@ v 7.13.0 (unreleased) - Add error message for SSH key linebreaks - Store commits count in database (will populate with valid values only after first push) - Rebuild cache after push to repository in background job + - Fix transferring of project to another group using the API. v 7.12.2 - Correctly show anonymous authorized applications under Profile > Applications. - Faster automerge check and merge itself when source and target branches are in same repository - Audit log for user authentication - - Fix transferring of project to another group using the API. - Allow custom label to be set for authentication providers. v 7.12.1 |