summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2015-06-22 09:54:14 +0000
committerJacob Vosmaer <contact@jacobvosmaer.nl>2015-06-22 09:54:14 +0000
commit29069abec30fbdcae43577874ddbddb6081c67b5 (patch)
treee160716833ac49c8a8e45c2673295c13358f07ea
parent0214a21db515caba029bca2c2f431840bdfee895 (diff)
parent3d45b9161acf55150e312301a992909e17284f10 (diff)
downloadgitlab-ce-29069abec30fbdcae43577874ddbddb6081c67b5.tar.gz
Merge branch 'change_log_update' into 'master'
Minor changelog fix See merge request !861
-rw-r--r--CHANGELOG2
1 files changed, 1 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index d1bf4c1fb0f..2d9c047926d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -63,7 +63,7 @@ v 7.12.0 (unreleased)
- Allow to configure a URL to show after sign out
- Add an option to automatically sign-in with an Omniauth provider
- Better performance for web editor (switched from satellites to rugged)
- - GitLab CI service sends .gitlab-ci.yaml in each push call
+ - GitLab CI service sends .gitlab-ci.yml in each push call
- When remove project - move repository and schedule it removal
- Improve group removing logic
- Trigger create-hooks on backup restore task