From f293d991a4bd55df10ff8dc9201b6b45377a6681 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 11 Aug 2015 10:26:12 +0200 Subject: Revert "Merge branch 'mr-widget-text' into 'master' " This reverts commit 151d9fb35fd66a161cf0e1f95d7b0f0448ca8034, reversing changes made to 819d110cabfc2791e0e84bd89b9f87aef570c1db. --- CHANGELOG | 2 -- 1 file changed, 2 deletions(-) (limited to 'CHANGELOG') diff --git a/CHANGELOG b/CHANGELOG index d228ef616d4..ebffc0d90ab 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -44,8 +44,6 @@ v 7.14.0 (unreleased) - 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 v 7.13.3 -- cgit v1.2.3 From 79b294267aba9e8c5e305620f0f00e4a9b581c23 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Tue, 11 Aug 2015 11:40:39 +0200 Subject: Remove changelog items Signed-off-by: Dmitriy Zaporozhets --- CHANGELOG | 2 -- 1 file changed, 2 deletions(-) (limited to 'CHANGELOG') diff --git a/CHANGELOG b/CHANGELOG index ebffc0d90ab..60848dcf57e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -42,7 +42,6 @@ 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) - Cache all events @@ -190,7 +189,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.3