From 3e259ea8bc198b7a5c67bd1e03dc9d44c7dd5854 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 11 Aug 2015 14:33:31 +0200 Subject: Revert "Merge branch 'revert-satellites' into 'master' " This reverts commit 5daf44b7c86e0e2641a902b1da8b01d91fa3dbfa, reversing changes made to 2f706fbd231cabe7a76a5d17ac44285aaaf8592c. --- CHANGELOG | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'CHANGELOG') diff --git a/CHANGELOG b/CHANGELOG index c0a98522fd4..8801cd6359f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -45,7 +45,10 @@ 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 @@ -196,6 +199,7 @@ 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 -- cgit v1.2.1 From d25c56cfd8da9b94ba5744a9bd09c05070b25c64 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 11 Aug 2015 14:41:31 +0200 Subject: Update CHANGELOG Signed-off-by: Dmitriy Zaporozhets --- CHANGELOG | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'CHANGELOG') diff --git a/CHANGELOG b/CHANGELOG index 8801cd6359f..7aef3bf40a8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,13 @@ Please view this file on the master branch, on stable branches it's out of date. +v 8.0.0 (unreleased) + - Remove satellites + - Better performance for web editor (switched from satellites to rugged) + - Faster merge + - Ability to fetch merge requests from refs/merge-requests/:id + - Improve MR merge widget text and UI consistency. + - Improve text in MR "How To Merge" modal. + v 7.14.0 (unreleased) - Disable turbolinks when linking to Bitbucket import status (Stan Hu) - Fix broken code import and display error messages if something went wrong with creating project (Stan Hu) @@ -45,10 +53,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 +204,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 -- cgit v1.2.1