summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-04-21 10:31:20 +0000
committerRémy Coutable <remy@rymai.me>2016-04-21 10:31:20 +0000
commit338f6f09028d8c4214845fe88a307eed0dc1a8c4 (patch)
tree5c7caa5193301fe1ab4a48c7fb11526ad0e30edd /app/controllers
parenta5ed44fd711ea55e3f76b364b2cc797ea0f38ba7 (diff)
parent9581aba4d46f4f31e0ae1f4b76726d5ad01041e7 (diff)
downloadgitlab-ce-338f6f09028d8c4214845fe88a307eed0dc1a8c4.tar.gz
Merge branch 'issue_5838' into 'master'
Show project members only for members fixes #5838 See merge request !3752
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/projects/project_members_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/project_members_controller.rb b/app/controllers/projects/project_members_controller.rb
index e457db2f0b7..33b2625c0ac 100644
--- a/app/controllers/projects/project_members_controller.rb
+++ b/app/controllers/projects/project_members_controller.rb
@@ -1,6 +1,6 @@
class Projects::ProjectMembersController < Projects::ApplicationController
# Authorize
- before_action :authorize_admin_project_member!, except: :leave
+ before_action :authorize_admin_project_member!, except: [:leave, :index]
def index
@project_members = @project.project_members