summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-05-02 15:26:25 +0000
committerRobert Speicher <robert@gitlab.com>2016-05-02 15:26:25 +0000
commitf47e1e8892e41cc4a8aa5d29ce9675cf42acf7b4 (patch)
tree46a82cfc743ab43a5917f2771c6d308a7bafb571
parentec2710d0f545864489c0fb6525b722a6cba7ab33 (diff)
parent1dfd051ec58e5c1a324d3b5493552289a44f1aa0 (diff)
downloadgitlab-ce-f47e1e8892e41cc4a8aa5d29ce9675cf42acf7b4.tar.gz
Merge branch 'fix-changelog' into 'master'
Remove duplicate entry in the CHANGELOG [ci skip] See merge request !4002
-rw-r--r--CHANGELOG1
1 files changed, 0 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 121b03be320..f1f93a3cb0a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -140,7 +140,6 @@ v 8.7.0
- Import GitHub labels
- Add option to filter by "Owned projects" on dashboard page
- Import GitHub milestones
- - Fix emoji catgories in the emoji picker
- Execute system web hooks on push to the project
- Allow enable/disable push events for system hooks
- Fix GitHub project's link in the import page when provider has a custom URL