summaryrefslogtreecommitdiff
path: root/lib/api/namespaces.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-23 15:07:48 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-23 15:07:48 +0000
commitfda8735029d5aea76060f2e2b071ebcd6cd0777e (patch)
tree785f01501ab938aeed86fea53063e4598dd28d81 /lib/api/namespaces.rb
parent4aeb8a02c506eaa8f0710ee17edd9e35dd68d280 (diff)
downloadgitlab-ce-fda8735029d5aea76060f2e2b071ebcd6cd0777e.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/api/namespaces.rb')
-rw-r--r--lib/api/namespaces.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/api/namespaces.rb b/lib/api/namespaces.rb
index c51417d2889..e40a5dde7ce 100644
--- a/lib/api/namespaces.rb
+++ b/lib/api/namespaces.rb
@@ -32,6 +32,8 @@ module API
get do
namespaces = current_user.admin ? Namespace.all : current_user.namespaces
+ namespaces = namespaces.include_gitlab_subscription if Gitlab.ee?
+
namespaces = namespaces.search(params[:search]) if params[:search].present?
options = { with: Entities::Namespace, current_user: current_user }