summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2015-07-01 15:57:44 +0200
committerJacob Vosmaer <contact@jacobvosmaer.nl>2015-07-01 15:57:44 +0200
commit6d6cff558c94d4f4a9227ef734fe43e4bb3a3d4a (patch)
tree9736c7bdd43a530af9375d69efe06d51e270c612
parent3eadb4d8245c6104947905275053f2e8b460cb43 (diff)
downloadgitlab-ce-6d6cff558c94d4f4a9227ef734fe43e4bb3a3d4a.tar.gz
Update CHANGELOG for 7.12.1
-rw-r--r--CHANGELOG7
1 files changed, 6 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 92d00789c99..99cddd57028 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -10,9 +10,14 @@ v 7.13.0 (unreleased)
- Update ssl_ciphers in Nginx example to remove DHE settings. This will deny forward secrecy for Android 2.3.7, Java 6 and OpenSSL 0.9.8
- Convert CRLF newlines to LF when committing using the web editor.
-v 7.12.1 (unreleased)
+v 7.12.1
- Fix error when deleting a user who has projects (Stan Hu)
- Fix post-receive errors on a push when an external issue tracker is configured (Stan Hu)
+ - Add SAML to list of social_provider (Matt Firtion)
+ - Fix merge requests API scope to keep compatibility in 7.12.x patch release (Dmitriy Zaporozhets)
+ - Fix closed merge request scope at milestone page (Dmitriy Zaporozhets)
+ - Revert merge request states renaming
+ - Fix hooks for web based events with external issue references (Daniel Gerhardt)
v 7.12.0
- Fix Error 500 when one user attempts to access a personal, internal snippet (Stan Hu)