Merge branch 'ac-pages-subgroups' into 'master'

Enable Gitlab-Pages for subgroups

See merge request gitlab-org/gitlab-ce!23505

1 files changed, 2 insertions, 2 deletions

diff --git a/spec/controllers/projects/pages_controller_spec.rb b/spec/controllers/projects/pages_controller_spec.rb
index 382c1b5d124..4b742a5d427 100644
--- a/spec/controllers/projects/pages_controller_spec.rb
+++ b/spec/controllers/projects/pages_controller_spec.rb
@@ -28,10 +28,10 @@ describe Projects::PagesController do
       let(:group) { create(:group, :nested) }
       let(:project) { create(:project, namespace: group) }
 
-      it 'returns a 404 status code' do
+      it 'returns a 200 status code' do
         get :show, params: request_params
 
-        expect(response).to have_gitlab_http_status(404)
+        expect(response).to have_gitlab_http_status(200)
       end
     end
   end