summaryrefslogtreecommitdiff
path: root/lib/api/helpers/users_helpers.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-09-13 13:26:31 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-09-13 13:26:31 +0000
commitb7dfe2ae4054aa40e15182fd3c6cb7dd39f131db (patch)
tree5ab080ca9cadeb6cd9578bf301e4e9e8810bed9e /lib/api/helpers/users_helpers.rb
parent25cb337cf12438169f1b14bc5dace8a06a7356e3 (diff)
downloadgitlab-ce-b7dfe2ae4054aa40e15182fd3c6cb7dd39f131db.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/api/helpers/users_helpers.rb')
-rw-r--r--lib/api/helpers/users_helpers.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/api/helpers/users_helpers.rb b/lib/api/helpers/users_helpers.rb
index 56fd3c6602d..99eefc1cbb9 100644
--- a/lib/api/helpers/users_helpers.rb
+++ b/lib/api/helpers/users_helpers.rb
@@ -14,3 +14,5 @@ module API
end
end
end
+
+API::Helpers::UsersHelpers.prepend_if_ee('EE::API::Helpers::UsersHelpers')