diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb index 2fccec52d334f7d70c022da42619ab6a934fb583..bfafdeeb1fb81e10556e9ef5c107415475375b47 100644 --- a/app/controllers/projects/issues_controller.rb +++ b/app/controllers/projects/issues_controller.rb @@ -6,10 +6,10 @@ class Projects::IssuesController < Projects::ApplicationController before_action :authorize_read_issue! # Allow write(create) issue - before_action :authorize_write_issue!, only: [:new, :create] + before_action :authorize_create_issue!, only: [:new, :create] # Allow modify issue - before_action :authorize_modify_issue!, only: [:edit, :update] + before_action :authorize_update_issue!, only: [:edit, :update] # Allow issues bulk update before_action :authorize_admin_issues!, only: [:bulk_update] @@ -122,7 +122,7 @@ class Projects::IssuesController < Projects::ApplicationController end end - def authorize_modify_issue! + def authorize_update_issue! return render_404 unless can?(current_user, :update_issue, @issue) end diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index b50c0dd18ea69d64d6e37fd04341743ba1a1b0ce..d12651983187b65eb4a14e88704a1ea49a33b332 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -14,10 +14,10 @@ class Projects::MergeRequestsController < Projects::ApplicationController before_action :authorize_read_merge_request! # Allow write(create) merge_request - before_action :authorize_write_merge_request!, only: [:new, :create] + before_action :authorize_create_merge_request!, only: [:new, :create] # Allow modify merge_request - before_action :authorize_modify_merge_request!, only: [:close, :edit, :update, :sort] + before_action :authorize_update_merge_request!, only: [:close, :edit, :update, :sort] def index terms = params['issue_search'] @@ -218,7 +218,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController @closes_issues ||= @merge_request.closes_issues end - def authorize_modify_merge_request! + def authorize_update_merge_request! return render_404 unless can?(current_user, :update_merge_request, @merge_request) end diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb index f3e521adb696e3f2c4bfbaa0722b2443b2943b8b..c4a87e9dbd824a85b222991ec2d0523b4a2057f0 100644 --- a/app/controllers/projects/notes_controller.rb +++ b/app/controllers/projects/notes_controller.rb @@ -1,7 +1,7 @@ class Projects::NotesController < Projects::ApplicationController # Authorize before_action :authorize_read_note! - before_action :authorize_write_note!, only: [:create] + before_action :authorize_create_note!, only: [:create] before_action :authorize_admin_note!, only: [:update, :destroy] before_action :find_current_user_notes, except: [:destroy, :delete_attachment] diff --git a/app/controllers/projects/snippets_controller.rb b/app/controllers/projects/snippets_controller.rb index a0caa4018c39d7396f8db08b0fd7b63ad307c6cc..643066374230cc5038b21410659073d0af473517 100644 --- a/app/controllers/projects/snippets_controller.rb +++ b/app/controllers/projects/snippets_controller.rb @@ -6,10 +6,10 @@ class Projects::SnippetsController < Projects::ApplicationController before_action :authorize_read_project_snippet! # Allow write(create) snippet - before_action :authorize_write_project_snippet!, only: [:new, :create] + before_action :authorize_create_project_snippet!, only: [:new, :create] # Allow modify snippet - before_action :authorize_modify_project_snippet!, only: [:edit, :update] + before_action :authorize_update_project_snippet!, only: [:edit, :update] # Allow destroy snippet before_action :authorize_admin_project_snippet!, only: [:destroy] @@ -75,7 +75,7 @@ class Projects::SnippetsController < Projects::ApplicationController @snippet ||= @project.snippets.find(params[:id]) end - def authorize_modify_project_snippet! + def authorize_update_project_snippet! return render_404 unless can?(current_user, :update_project_snippet, @snippet) end diff --git a/app/controllers/projects/wikis_controller.rb b/app/controllers/projects/wikis_controller.rb index 287219eabd5dd83d749ea4aa1634d3453b5fa4ad..50512cb6dc359769c3932e3b85ba8d9300e89b78 100644 --- a/app/controllers/projects/wikis_controller.rb +++ b/app/controllers/projects/wikis_controller.rb @@ -2,7 +2,7 @@ require 'project_wiki' class Projects::WikisController < Projects::ApplicationController before_action :authorize_read_wiki! - before_action :authorize_write_wiki!, only: [:edit, :create, :history] + before_action :authorize_create_wiki!, only: [:edit, :create, :history] before_action :authorize_admin_wiki!, only: :destroy before_action :load_project_wiki include WikiHelper diff --git a/app/controllers/snippets_controller.rb b/app/controllers/snippets_controller.rb index 0ca71c155c51b59e12068a98a6f0196ba4132f9d..8e7e45c781f53a43b2baa58399a21a42fe117393 100644 --- a/app/controllers/snippets_controller.rb +++ b/app/controllers/snippets_controller.rb @@ -2,7 +2,7 @@ class SnippetsController < ApplicationController before_action :snippet, only: [:show, :edit, :destroy, :update, :raw] # Allow modify snippet - before_action :authorize_modify_snippet!, only: [:edit, :update] + before_action :authorize_update_snippet!, only: [:edit, :update] # Allow destroy snippet before_action :authorize_admin_snippet!, only: [:destroy] @@ -87,7 +87,7 @@ class SnippetsController < ApplicationController end end - def authorize_modify_snippet! + def authorize_update_snippet! return render_404 unless can?(current_user, :update_personal_snippet, @snippet) end