summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-09-08 15:52:15 -0300
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-09-08 15:52:15 -0300
commite278de7ffb500de2af7383cba7b8dcc57d80d164 (patch)
treec2da9d6fdad352d0827639afd8f82c0672538abe
parent9c260218d1f278ddf0e86d92b159f8b024e42d65 (diff)
downloadgitlab-ce-github-avoid-conflicts-with-admin-labels.tar.gz
-rw-r--r--CHANGELOG1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 21a2661515d..4e26d643d56 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -111,6 +111,7 @@ v 8.12.0 (unreleased)
- Allow bulk update merge requests from merge requests index page
v 8.11.6 (unreleased)
+ - Avoid conflict with admin labels when importing GitHub labels
v 8.11.5
- Optimize branch lookups and force a repository reload for Repository#find_branch. !6087