From b7dfe2ae4054aa40e15182fd3c6cb7dd39f131db Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 13 Sep 2019 13:26:31 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/controllers/projects/project_members_controller.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'app/controllers/projects/project_members_controller.rb') diff --git a/app/controllers/projects/project_members_controller.rb b/app/controllers/projects/project_members_controller.rb index 8938cfbad54..b01d48ca3d3 100644 --- a/app/controllers/projects/project_members_controller.rb +++ b/app/controllers/projects/project_members_controller.rb @@ -51,3 +51,5 @@ class Projects::ProjectMembersController < Projects::ApplicationController # MembershipActions concern alias_method :membershipable, :project end + +Projects::ProjectMembersController.prepend_if_ee('EE::Projects::ProjectMembersController') -- cgit v1.2.1