summaryrefslogtreecommitdiff
path: root/CHANGELOG
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-06-04 15:56:13 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-06-04 15:56:13 +0000
commitef3e0931b904ea79630d4d47f4e40dd3ede92f79 (patch)
tree45a46a386051144cb651ca49fd263076a0f1ceae /CHANGELOG
parent7f042e8bcb6536c77ea0b3cf3cd2e122281181e2 (diff)
parentcf7707b4fe474e5399481a04911cb08043c14874 (diff)
downloadgitlab-ce-ef3e0931b904ea79630d4d47f4e40dd3ede92f79.tar.gz
Merge branch 'fix-no-labels-page' into 'master'
Omit link to generate labels if user does not have access to create them On a project that has no labels, a user was provided a link to create labels on the "Labels" tab, resulting in a 404. This MR changes the next to "No labels created" if the user lands on this page but does not have permission to add a label. Screenshot: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/cb04659cf3a0abe1e072cb78d0964b94/image.png) Closes https://github.com/gitlabhq/gitlabhq/issues/8353 See merge request !752
Diffstat (limited to 'CHANGELOG')
-rw-r--r--CHANGELOG1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index a0b56bd3055..ca419f057e0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date.
v 7.12.0 (unreleased)
- Don't notify users mentioned in code blocks or blockquotes.
+ - Omit link to generate labels if user does not have access to create them (Stan Hu)
- Disable changing of the source branch in merge request update API (Stan Hu)
- Shorten merge request WIP text.
- Add option to disallow users from registering any application to use GitLab as an OAuth provider