diff options
| author | Robert Schilling <rschilling@student.tugraz.at> | 2015-07-20 17:28:43 +0000 |
|---|---|---|
| committer | Robert Schilling <rschilling@student.tugraz.at> | 2015-07-20 17:28:43 +0000 |
| commit | 57f9a1ccd4e97747cf09ffd98e8c44056c0846e5 (patch) | |
| tree | 196505344ead2f6680da884756a1ff418fcf74d1 | |
| parent | e8c147903b55fda14f503adf7efcf0b69c54fe67 (diff) | |
| parent | e252410058a5aab0cb0427aeb0768b19b0fce4de (diff) | |
| download | gitlab-ce-57f9a1ccd4e97747cf09ffd98e8c44056c0846e5.tar.gz | |
Merge branch 'fix-changelog-7.11-7.12' into 'master'
Fix change log for 7.11 and move entry to 7.12
The change log for 7.11 was accidentally split in
3865a1d92585cb31864b5d0f1b325c3585b5c681. Additionally, the change added
with this commit did not make it into 7.11 according to
`git branch --contains` and it has not been cherry picked to 7-11-stable
so the entry is moved to 7.12.
Refs GH-5625, GH-9318.
See merge request !1009
| -rw-r--r-- | CHANGELOG | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG index d249a014802..052f4865d69 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -134,6 +134,7 @@ v 7.12.0 - Improve group removing logic - Trigger create-hooks on backup restore task - Add option to automatically link omniauth and LDAP identities + - Allow special character in users bio. I.e.: I <3 GitLab v 7.11.4 - Fix missing bullets when creating lists @@ -152,9 +153,6 @@ v 7.11.1 v 7.11.0 - Fall back to Plaintext when Syntaxhighlighting doesn't work. Fixes some buggy lexers (Hannes Rosenögger) - Get editing comments to work in Chrome 43 again. - - Allow special character in users bio. I.e.: I <3 GitLab - -v 7.11.0 - Fix broken view when viewing history of a file that includes a path that used to be another file (Stan Hu) - Don't show duplicate deploy keys - Fix commit time being displayed in the wrong timezone in some cases (Hannes Rosenögger) |