diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-09 00:34:03 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-09 00:34:03 +0300 |
| commit | 8fb49a4b7005d7e57bb84d6fe5db97ff39d1064b (patch) | |
| tree | 38118628101e0b9281a07c295d15d0c9f075197b /CHANGELOG | |
| parent | f39ff54290abe224b0b79accc0da48c1cd2d2109 (diff) | |
| parent | e616739e2fae12e5358d2cea40089a51468d9b4a (diff) | |
Merge branch 'master' into merge-if-green
# Conflicts:
# app/views/projects/merge_requests/widget/_heading.html.haml
# app/views/projects/merge_requests/widget/open/_accept.html.haml
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 77be71b08d2..f0d60d26649 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,9 +3,12 @@ Please view this file on the master branch, on stable branches it's out of date. v 8.3.0 (unreleased) - Merge when build succeeds (Zeger-Jan van de Weg) - Bump gollum-lib to 4.1.0 (Stan Hu) + - Fix broken group avatar upload under "New group" (Stan Hu) + - Update project repositorize size and commit count during import:repos task (Stan Hu) - Fix API setting of 'public' attribute to false will make a project private (Stan Hu) - Handle and report SSL errors in Web hook test (Stan Hu) - Fix: Assignee selector is empty when 'Unassigned' is selected (Jose Corcuera) + - Add rake tasks for git repository maintainance (Zeger-Jan van de Weg) - Fix 500 error when update group member permission - Trim leading and trailing whitespace of milestone and issueable titles (Jose Corcuera) - Recognize issue/MR/snippet/commit links as references @@ -20,6 +23,8 @@ v 8.3.0 (unreleased) - Fix 500 error when creating a merge request that removes a submodule - Run custom Git hooks when branch is created or deleted. - Fix bug when simultaneously accepting multiple MRs results in MRs that are of "merged" status, but not merged to the target branch + - Add languages page to graphs + - Block LDAP user when they are no longer found in the LDAP server v 8.2.3 - Fix application settings cache not expiring after changes (Stan Hu) |