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

Merge branch 'fix-changelog-versions' into 'master'
59c486dc · Stan Hu · 0c317019 · 1681fd7b · 59c486dc
Commit 59c486dc authored Aug 07, 2015 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 5 deletions

CHANGELOG CHANGELOG +3 -5

No files found.
--- 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