From 1265dccb6b8eaa0b51b1368e92655328514df1d5 Mon Sep 17 00:00:00 2001 From: Robert Schilling Date: Mon, 13 Apr 2015 20:01:43 +0200 Subject: Fix wrong merged changelog entries --- CHANGELOG | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index eab4ff4e6ad..9982a32f28b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -73,16 +73,15 @@ v 7.10.0 (unreleased) - Fix git over ssh errors 'fatal: protocol error: bad line length character' - Automatically setup GitLab CI project for forks if origin project has GitLab CI enabled - Bust group page project list cache when namespace name or path changes. - -v 7.9.3 - - Contains no changes - Add icons to Add dropdown items. - Allow admin to create public deploy keys that are accessible to any project. - Warn when gitlab-shell version doesn't match requirement. - Skip email confirmation when set by admin or via LDAP. - - Only allow users to reference groups, projects, issues, MRs, commits they have access to. +v 7.9.3 + - Contains no changes + v 7.9.2 - Contains no changes -- cgit v1.2.1 From 5fa7be3ab40de4cb411bf47e1afd417023e54bc9 Mon Sep 17 00:00:00 2001 From: Robert Schilling Date: Mon, 13 Apr 2015 20:35:50 +0200 Subject: Remove superseeded changelog entry for commit calendar --- CHANGELOG | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 9982a32f28b..fa88ce3d8a1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -19,7 +19,6 @@ v 7.10.0 (unreleased) - Disable reference creation for comments surrounded by code/preformatted blocks (Stan Hu) - Reduce Rack Attack false positives causing 403 errors during HTTP authentication (Stan Hu) - enable line wrapping per default and remove the checkbox to toggle it (Hannes Rosenögger) - - extend the commit calendar to show the actual commits made on a date (Hannes Rosenögger) - Fix a link in the patch update guide - Add a service to support external wikis (Hannes Rosenögger) - Omit the "email patches" link and fix plain diff view for merge commits -- cgit v1.2.1