diff options
| author | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-03-15 19:13:26 +0100 |
|---|---|---|
| committer | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-03-15 19:16:16 +0100 |
| commit | 59064aeeef8562a87d4d03efa9b11012a007e261 (patch) | |
| tree | 1ecb34e1355a4eb714615b2a9c2727155e8f3ec9 /app/controllers/projects/labels_controller.rb | |
| parent | aaf4434b0e24da916d4392aa9cd001cdb8e0c7dc (diff) | |
| parent | bc590ce63bd2f1af5545b648e6d028a557e7c792 (diff) | |
| download | gitlab-ce-4009-external-users.tar.gz | |
Merge branch 'master' into 4009-external-users4009-external-users
Diffstat (limited to 'app/controllers/projects/labels_controller.rb')
| -rw-r--r-- | app/controllers/projects/labels_controller.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/app/controllers/projects/labels_controller.rb b/app/controllers/projects/labels_controller.rb index ecac3c395ec..40d8098690a 100644 --- a/app/controllers/projects/labels_controller.rb +++ b/app/controllers/projects/labels_controller.rb @@ -1,8 +1,12 @@ class Projects::LabelsController < Projects::ApplicationController + include ToggleSubscriptionAction + before_action :module_enabled before_action :label, only: [:edit, :update, :destroy] before_action :authorize_read_label! - before_action :authorize_admin_labels!, except: [:index] + before_action :authorize_admin_labels!, only: [ + :new, :create, :edit, :update, :generate, :destroy + ] respond_to :js, :html @@ -73,8 +77,9 @@ class Projects::LabelsController < Projects::ApplicationController end def label - @label = @project.labels.find(params[:id]) + @label ||= @project.labels.find(params[:id]) end + alias_method :subscribable_resource, :label def authorize_admin_labels! return render_404 unless can?(current_user, :admin_label, @project) |