Use single line on CHANGELOG

528c7b9e · Lin Jen-Shin (godfat) · b27867c0 · 528c7b9e
Commit 528c7b9e authored Jul 06, 2016 by Lin Jen-Shin (godfat)
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

CHANGELOG-EE CHANGELOG-EE +1 -3

No files found.
--- a/CHANGELOG-EE
+++ b/CHANGELOG-EE
@@ -9,9 +9,7 @@ v 8.9.0 (unreleased)
  - Add API endpoint for Merge Request Approvals !449
  - Distribute RepositoryUpdateMirror jobs in time and add exclusive lease on them by project_id
  - [Elastic] Move ES settings to application settings
-  - Allow merging if FF is possible regardless rebased or not under: !454
-    - Merge commit with semi-linear history
-    - Fast-forward merge
+  - Always allow merging a merge request whenever fast-forward is possible. !454
  - Disable mirror flag for projects without import_url
  - UpdateMirror service return an error status when no mirror
  - Show flash notice when Git Hooks are updated successfully