diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-11 12:27:38 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-11 12:27:38 +0000 |
commit | 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa (patch) | |
tree | dbf754ad57c523759284cf5d8af84fd9f096701a /CHANGELOG | |
parent | 2f706fbd231cabe7a76a5d17ac44285aaaf8592c (diff) | |
parent | 3a63c00505307a1d1e8196c0eae72a79b2a6885f (diff) | |
download | gitlab-ce-5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa.tar.gz |
Merge branch 'revert-satellites' into 'master'
Revert satellites
Return satellites to master for 7.14
We remove satellites in next release (8.0)
See merge request !1136
Diffstat (limited to 'CHANGELOG')
-rw-r--r-- | CHANGELOG | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG index 8801cd6359f..c0a98522fd4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -45,10 +45,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 comments and email addresses when publicly exposing ssh keys (Zeger-Jan van de Weg) - - Improve MR merge widget text and UI consistency. - - Improve text in MR "How To Merge" modal. - Cache all events - Order commits by date when comparing branches - Fix bug causing error when the target branch of a symbolic ref was deleted @@ -199,7 +196,6 @@ v 7.12.0 - Add SAML support as an omniauth provider - Allow to configure a URL to show after sign out - Add an option to automatically sign-in with an Omniauth provider - - Better performance for web editor (switched from satellites to rugged) - GitLab CI service sends .gitlab-ci.yml in each push call - When remove project - move repository and schedule it removal - Improve group removing logic |