diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-09 09:00:25 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-09 09:00:25 +0100 |
| commit | eab086bde11f30551b4a8b27b0a344e654924a1c (patch) | |
| tree | 89e290bacbad9765560c7673344919a6b44ca02c /CHANGELOG | |
| parent | 1464a69c76cf492ad8b9674e24260e917dc7d2ef (diff) | |
| parent | ee0ab46d327e278af68cbda49e00cd5188c709f3 (diff) | |
| download | gitlab-ce-eab086bde11f30551b4a8b27b0a344e654924a1c.tar.gz | |
Merge branch 'master' into merge-if-green
# Conflicts:
# app/controllers/projects/merge_requests_controller.rb
# config/routes.rb
Diffstat (limited to 'CHANGELOG')
| -rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index f0d60d26649..59fe30746c6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -25,6 +25,7 @@ v 8.3.0 (unreleased) - 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 + - Improve wording on project visibility levels (Zeger-Jan van de Weg) v 8.2.3 - Fix application settings cache not expiring after changes (Stan Hu) |