summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schilling <rschilling@student.tugraz.at>2015-05-29 20:10:17 +0000
committerRobert Schilling <rschilling@student.tugraz.at>2015-05-29 20:10:17 +0000
commit7c1f984c3c8d343e23fe510325da3ec1ee19f87e (patch)
tree6fc3481bb710bfd9b523ae955066be286df054b2
parent467d7f6720c6b85d2b1559bb7263dde0f448402e (diff)
parent9d733d14b89513e9ea2249b84fb2db25f67d7614 (diff)
downloadgitlab-ce-7c1f984c3c8d343e23fe510325da3ec1ee19f87e.tar.gz
Merge branch 'fix/saml_changelog' into 'master'
Fix misplaced changelog entry for SAML support See merge request !746
-rw-r--r--CHANGELOG2
1 files changed, 1 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 66d23dcfd4f..4adbecfd2c2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -34,6 +34,7 @@ v 7.12.0 (unreleased)
- You can not remove user if he/she is an only owner of group
- User should be able to leave group. If not - show him proper message
- User has ability to leave project
+ - Add SAML support as an omniauth provider
v 7.11.4
- Fix missing bullets when creating lists
@@ -41,7 +42,6 @@ v 7.11.4
v 7.11.3
- no changes
- - Add SAML support as an omniauth provider
v 7.11.2
- no changes