diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-26 15:55:56 +0200 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-06-26 15:55:56 +0200 |
commit | 342d5537091e61c1fc52f3e54df926159f326eb8 (patch) | |
tree | 6e852b3f112a6a9f03d05148ed5e73e13582a48e /app/controllers | |
parent | d5947ada4493335d49368ec193f4b9b801582deb (diff) | |
download | gitlab-ce-342d5537091e61c1fc52f3e54df926159f326eb8.tar.gz |
Rename abilities to correspond contoller/model action namesrename-abilities
write_ was renamed to create_
modify_ was renamed to update_
So now in update action we have next code
def create
can?(current_user, :create_issue, @issue)
end
def update
can?(current_user, :update_issue, @issue)
end
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/projects/issues_controller.rb | 2 | ||||
-rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 2 | ||||
-rw-r--r-- | app/controllers/projects/snippets_controller.rb | 2 | ||||
-rw-r--r-- | app/controllers/projects/wikis_controller.rb | 4 | ||||
-rw-r--r-- | app/controllers/snippets_controller.rb | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb index 69bd1f58449..2fccec52d33 100644 --- a/app/controllers/projects/issues_controller.rb +++ b/app/controllers/projects/issues_controller.rb @@ -123,7 +123,7 @@ class Projects::IssuesController < Projects::ApplicationController end def authorize_modify_issue! - return render_404 unless can?(current_user, :modify_issue, @issue) + return render_404 unless can?(current_user, :update_issue, @issue) end def authorize_admin_issues! diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index a13688305b7..b50c0dd18ea 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -219,7 +219,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController end def authorize_modify_merge_request! - return render_404 unless can?(current_user, :modify_merge_request, @merge_request) + return render_404 unless can?(current_user, :update_merge_request, @merge_request) end def authorize_admin_merge_request! diff --git a/app/controllers/projects/snippets_controller.rb b/app/controllers/projects/snippets_controller.rb index 3d75abcc29d..a0caa4018c3 100644 --- a/app/controllers/projects/snippets_controller.rb +++ b/app/controllers/projects/snippets_controller.rb @@ -76,7 +76,7 @@ class Projects::SnippetsController < Projects::ApplicationController end def authorize_modify_project_snippet! - return render_404 unless can?(current_user, :modify_project_snippet, @snippet) + return render_404 unless can?(current_user, :update_project_snippet, @snippet) end def authorize_admin_project_snippet! diff --git a/app/controllers/projects/wikis_controller.rb b/app/controllers/projects/wikis_controller.rb index 36ef86e1909..287219eabd5 100644 --- a/app/controllers/projects/wikis_controller.rb +++ b/app/controllers/projects/wikis_controller.rb @@ -28,7 +28,7 @@ class Projects::WikisController < Projects::ApplicationController ) end else - return render('empty') unless can?(current_user, :write_wiki, @project) + return render('empty') unless can?(current_user, :create_wiki, @project) @page = WikiPage.new(@project_wiki) @page.title = params[:id] @@ -43,7 +43,7 @@ class Projects::WikisController < Projects::ApplicationController def update @page = @project_wiki.find_page(params[:id]) - return render('empty') unless can?(current_user, :write_wiki, @project) + return render('empty') unless can?(current_user, :create_wiki, @project) if @page.update(content, format, message) redirect_to( diff --git a/app/controllers/snippets_controller.rb b/app/controllers/snippets_controller.rb index cf672c5c093..0ca71c155c5 100644 --- a/app/controllers/snippets_controller.rb +++ b/app/controllers/snippets_controller.rb @@ -88,7 +88,7 @@ class SnippetsController < ApplicationController end def authorize_modify_snippet! - return render_404 unless can?(current_user, :modify_personal_snippet, @snippet) + return render_404 unless can?(current_user, :update_personal_snippet, @snippet) end def authorize_admin_snippet! |