Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 3 deletions

diff --git a/spec/requests/api/internal/pages_spec.rb b/spec/requests/api/internal/pages_spec.rb
index 23bbd0681d6..2887163fe58 100644
--- a/spec/requests/api/internal/pages_spec.rb
+++ b/spec/requests/api/internal/pages_spec.rb
@@ -47,11 +47,12 @@ describe API::Internal::Pages do
           project.mark_pages_as_deployed
         end
 
-        context 'not existing host' do
-          it 'responds with 404 Not Found' do
+        context 'domain does not exist' do
+          it 'responds with 204 no content' do
             query_host('pages.gitlab.io')
 
-            expect(response).to have_gitlab_http_status(404)
+            expect(response).to have_gitlab_http_status(204)
+            expect(response.body).to be_empty
           end
         end