summaryrefslogtreecommitdiff
path: root/lib/api/internal
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-04 12:07:12 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-04 12:07:12 +0000
commit98420be3dddf5a093c39d96a8ca109aa21d0eaf8 (patch)
tree694cbe805e82d5383dc30c462f5efb60e55ccebe /lib/api/internal
parentc4038d4bdff93b260cbdcd69f9a6c0b07a849457 (diff)
downloadgitlab-ce-98420be3dddf5a093c39d96a8ca109aa21d0eaf8.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/api/internal')
-rw-r--r--lib/api/internal/pages.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/internal/pages.rb b/lib/api/internal/pages.rb
index 003af7f6dd4..a2fe3e09df8 100644
--- a/lib/api/internal/pages.rb
+++ b/lib/api/internal/pages.rb
@@ -25,7 +25,7 @@ module API
end
get "/" do
host = Namespace.find_by_pages_host(params[:host]) || PagesDomain.find_by_domain(params[:host])
- not_found! unless host
+ no_content! unless host
virtual_domain = host.pages_virtual_domain
no_content! unless virtual_domain