From 9802d3883fb42dd31f91d71018ac87ba0c32d1c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Thu, 6 Oct 2016 15:59:21 +0200
Subject: [PATCH] Re-add CHANGELOG entries removed by merge (9cc700315)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 CHANGELOG | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 864683efcdbf8..0ebf9084e6a9e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -62,6 +62,23 @@ v 8.13.0 (unreleased)
   - Close todos when accepting merge requests via the API !6486 (tonygambone)
   - Changed Slack service user referencing from full name to username (Sebastian Poxhofer)
   - Add Container Registry on/off status to Admin Area !6638 (the-undefined)
+  - Grouped pipeline dropdown is a scrollable container
+
+v 8.12.5 (unreleased)
+
+v 8.12.4
+  - Fix "Copy to clipboard" tooltip to say "Copied!" when clipboard button is clicked. !6294 (lukehowell)
+  - Fix padding in build sidebar. !6506
+  - Changed compare dropdowns to dropdowns with isolated search input. !6550
+  - Fix race condition on LFS Token. !6592
+  - Fix type mismatch bug when closing Jira issue. !6619
+  - Fix lint-doc error. !6623
+  - Skip wiki creation when GitHub project has wiki enabled. !6665
+  - Fix issues importing services via Import/Export. !6667
+  - Restrict failed login attempts for users with 2FA enabled. !6668
+  - Fix failed project deletion when feature visibility set to private. !6688
+  - Prevent claiming associated model IDs via import.
+  - Set GitLab project exported file permissions to owner only
 
 v 8.12.3
   - Update Gitlab Shell to support low IO priority for storage moves
-- 
GitLab