summaryrefslogtreecommitdiff
path: root/lib/api/helpers
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-26 18:07:46 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-26 18:07:46 +0000
commit3677c80c9b40d5b412cbbe127510a7d7b975a8e7 (patch)
tree5a053fe22691e6b2962f359ad187e8a4754f911a /lib/api/helpers
parent319dea10f06e32d119c0d46b8ec7b898b92a53a3 (diff)
downloadgitlab-ce-3677c80c9b40d5b412cbbe127510a7d7b975a8e7.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/api/helpers')
-rw-r--r--lib/api/helpers/members_helpers.rb7
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/api/helpers/members_helpers.rb b/lib/api/helpers/members_helpers.rb
index 9e624903a62..3ccae8d85cc 100644
--- a/lib/api/helpers/members_helpers.rb
+++ b/lib/api/helpers/members_helpers.rb
@@ -5,6 +5,11 @@
module API
module Helpers
module MembersHelpers
+ extend Grape::API::Helpers
+
+ params :optional_filter_params_ee do
+ end
+
def find_source(source_type, id)
public_send("find_#{source_type}!", id) # rubocop:disable GitlabSecurity/PublicSend
end
@@ -42,3 +47,5 @@ module API
end
end
end
+
+API::Helpers::MembersHelpers.prepend_if_ee('EE::API::Helpers::MembersHelpers')