From 2c3b75a28c90c4bf51a3e5d4db02b44cf2480791 Mon Sep 17 00:00:00 2001
From: winniehell <git@winniehell.de>
Date: Thu, 25 Aug 2016 22:48:17 +0200
Subject: Add linting for duplicate CHANGELOG versions (!6039)

---
 scripts/lint-doc.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/scripts/lint-doc.sh b/scripts/lint-doc.sh
index bc6e4d94061..fb4d8463981 100755
--- a/scripts/lint-doc.sh
+++ b/scripts/lint-doc.sh
@@ -10,6 +10,15 @@ then
   exit 1
 fi
 
+# Ensure that the CHANGELOG does not contain duplicate versions
+DUPLICATE_CHANGELOG_VERSIONS=$(grep --extended-regexp '^v [0-9.]+' CHANGELOG | sed 's| (unreleased)||' | sort | uniq -d)
+if [ "${DUPLICATE_CHANGELOG_VERSIONS}" != "" ]
+then
+  echo '✖ ERROR: Duplicate versions in CHANGELOG:' >&2
+  echo "${DUPLICATE_CHANGELOG_VERSIONS}" >&2
+  exit 1
+fi
+
 echo "✔ Linting passed"
 exit 0
 
-- 
cgit v1.2.1


From 8d53271dd03f26be30c7ebf3ea2e11bb27265185 Mon Sep 17 00:00:00 2001
From: winniehell <git@winniehell.de>
Date: Thu, 25 Aug 2016 23:20:08 +0200
Subject: Fix old CHANGELOG entries

---
 CHANGELOG | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index e9445a18a18..39f0a9a04be 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -594,6 +594,7 @@ v 8.10.0
   - Export and import avatar as part of project import/export
   - Fix migration corrupting import data for old version upgrades
   - Show tooltip on GitLab export link in new project page
+  - Fix import_data wrongly saved as a result of an invalid import_url !5206
 
 v 8.9.9
   - Exclude some pending or inactivated rows in Member scopes
@@ -614,12 +615,6 @@ v 8.9.6
   - Keeps issue number when importing from Gitlab.com
   - Add Pending tab for Builds (Katarzyna Kobierska, Urszula Budziszewska)
 
-v 8.9.7 (unreleased)
-  - Fix import_data wrongly saved as a result of an invalid import_url
-
-v 8.9.6
-  - Fix importing of events under notes for GitLab projects
-
 v 8.9.5
   - Add more debug info to import/export and memory killer. !5108
   - Fixed avatar alignment in new MR view. !5095
@@ -1885,7 +1880,7 @@ v 8.1.3
   - Use issue editor as cross reference comment author when issue is edited with a new mention
   - Add Facebook authentication
 
-v 8.1.1
+v 8.1.2
   - Fix cloning Wiki repositories via HTTP (Stan Hu)
   - Add migration to remove satellites directory
   - Fix specific runners visibility
-- 
cgit v1.2.1