summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-06-26 16:39:38 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-06-26 16:39:38 +0200
commit2fa77909ae6161ca21076ddbbcbfe52c7a4f7e40 (patch)
tree3d7adee19e7ea314ea62aba6a5d463600300194f /lib
parentd3e040c7192dda22e3375a55f94eb958a70087bb (diff)
parent05ef7ba105b05f143e44cca696ceedc0a2eae34a (diff)
downloadgitlab-ce-2fa77909ae6161ca21076ddbbcbfe52c7a4f7e40.tar.gz
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Diffstat (limited to 'lib')
-rw-r--r--lib/api/issues.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/issues.rb b/lib/api/issues.rb
index c8db93eb778..4d632ce77c1 100644
--- a/lib/api/issues.rb
+++ b/lib/api/issues.rb
@@ -157,7 +157,7 @@ module API
if issue.valid?
# Find or create labels and attach to issue. Labels are valid because
# we already checked its name, so there can't be an error here
- unless params[:labels].nil?
+ if params[:labels] && can?(current_user, :admin_issue, user_project)
issue.remove_labels
# Create and add labels to the new created issue
issue.add_labels_by_names(params[:labels].split(','))