Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-04-10 15:39:10 +0300
committerDouwe Maan <douwe@gitlab.com>2015-04-14 13:05:49 +0300
commitff3caad4caf46049c8f202849a05fb15a2aaccb8 (patch)
tree77a75ff9d82a16b4f4637452c8c5fe157e0edcbc /app/controllers
parentae6d0aaae0d8f6251b30a8e5243a98f083f0cac9 (diff)
Rename manage_group ability to admin_group for consistency with project.
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/groups/application_controller.rb2
-rw-r--r--app/controllers/groups/milestones_controller.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/groups/application_controller.rb b/app/controllers/groups/application_controller.rb
index a73b8fa212a..469a6813ee2 100644
--- a/app/controllers/groups/application_controller.rb
+++ b/app/controllers/groups/application_controller.rb
@@ -13,7 +13,7 @@ class Groups::ApplicationController < ApplicationController
end
def authorize_admin_group!
- unless can?(current_user, :manage_group, group)
+ unless can?(current_user, :admin_group, group)
return render_404
end
end
diff --git a/app/controllers/groups/milestones_controller.rb b/app/controllers/groups/milestones_controller.rb
index c46b8fff88f..546ff2cc71f 100644
--- a/app/controllers/groups/milestones_controller.rb
+++ b/app/controllers/groups/milestones_controller.rb
@@ -51,6 +51,6 @@ class Groups::MilestonesController < ApplicationController
end
def authorize_group_milestone!
- return render_404 unless can?(current_user, :manage_group, group)
+ return render_404 unless can?(current_user, :admin_group, group)
end
end