Skip to content

Commit

Permalink
Merge branch 'fix-changelog-versions' into 'master'
Browse files Browse the repository at this point in the history
Fix CHANGELOG entries to belong in the right version

Reorder entries that were improperly grouped (one fix mentioned in #1522).

See merge request !1118
  • Loading branch information
stanhu committed Aug 7, 2015
2 parents 0c31701 + 1681fd7 commit 59c486d
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 59c486d

Please sign in to comment.