diff options
author | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-03-02 10:22:56 +0100 |
---|---|---|
committer | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-03-02 10:22:56 +0100 |
commit | ddfd09c09cb904529df567e5606d76c467ed856f (patch) | |
tree | d17a48cf08e580cac866417700ea1ffe74c48bd7 /lib/api/labels.rb | |
parent | 52c4a7866ed010d8db67e5ca976d8c73d4084784 (diff) | |
parent | 3b3f0fab452fb9cbe4fbe7f75112bef3a7f9d039 (diff) | |
download | gitlab-ce-ddfd09c09cb904529df567e5606d76c467ed856f.tar.gz |
Merge branch 'master' into zj-create-mattermost-team
Diffstat (limited to 'lib/api/labels.rb')
-rw-r--r-- | lib/api/labels.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/labels.rb b/lib/api/labels.rb index d2955af3f95..59f0e7cb647 100644 --- a/lib/api/labels.rb +++ b/lib/api/labels.rb @@ -1,7 +1,7 @@ module API class Labels < Grape::API include PaginationParams - + before { authenticate! } params do @@ -56,7 +56,7 @@ module API label = user_project.labels.find_by(title: params[:name]) not_found!('Label') unless label - present label.destroy, with: Entities::Label, current_user: current_user, project: user_project + label.destroy end desc 'Update an existing label. At least one optional parameter is required.' do |