summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Artur <felipefac@gmail.com>2016-04-20 10:57:31 -0300
committerFelipe Artur <felipefac@gmail.com>2016-04-20 10:57:31 -0300
commiteb99e5f5c1cb2dfd2e8d058c3866f08aba5f2a4c (patch)
tree531551317819b7dbaa04797a60738ff3ec5d8c92
parent0b91ff287d12d59bb4193fff4c8e605f8a1a6e69 (diff)
downloadgitlab-ce-eb99e5f5c1cb2dfd2e8d058c3866f08aba5f2a4c.tar.gz
Remove unused authorization from controller
-rw-r--r--app/controllers/projects/project_members_controller.rb5
-rw-r--r--app/helpers/projects_helper.rb2
-rw-r--r--app/models/ability.rb3
3 files changed, 2 insertions, 8 deletions
diff --git a/app/controllers/projects/project_members_controller.rb b/app/controllers/projects/project_members_controller.rb
index f8c9ff657df..33b2625c0ac 100644
--- a/app/controllers/projects/project_members_controller.rb
+++ b/app/controllers/projects/project_members_controller.rb
@@ -1,7 +1,6 @@
class Projects::ProjectMembersController < Projects::ApplicationController
# Authorize
before_action :authorize_admin_project_member!, except: [:leave, :index]
- before_action :authorize_read_members_list!, only: [:index]
def index
@project_members = @project.project_members
@@ -113,8 +112,4 @@ class Projects::ProjectMembersController < Projects::ApplicationController
def member_params
params.require(:project_member).permit(:user_id, :access_level)
end
-
- def authorize_read_members_list!
- render_403 unless can?(current_user, :read_members_list , @project)
- end
end
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index fc3662bc097..82f362b3b39 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -144,7 +144,7 @@ module ProjectsHelper
nav_tabs << :settings
end
- if can?(current_user, :read_members_list, project)
+ if can?(current_user, :read_project_member, project)
nav_tabs << :team
end
diff --git a/app/models/ability.rb b/app/models/ability.rb
index 386c3d82d2c..6103a2947e2 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -189,8 +189,7 @@ class Ability
:create_project,
:create_issue,
:create_note,
- :upload_file,
- :read_members_list
+ :upload_file
]
end