Automatic merge of gitlab-org/gitlab-ce master

app/controllers/projects/pages_domains_controller.rb

@@ -4,7 +4,7 @@ class Projects::PagesDomainsController < Projects::ApplicationController
   layout 'project_settings'
 
   before_action :require_pages_enabled!
-  before_action :authorize_update_pages!, except: [:show]
+  before_action :authorize_update_pages!
   before_action :domain, except: [:new, :create]
 
   def show

changelogs/unreleased/54850-pages-domain-show-view-is-not-protected-by-access-control.yml

+---
+title: Require maintainer access to show pages domain settings
+merge_request: 24926
+author:
+type: fixed

package.json

@@ -28,7 +28,7 @@
     "@babel/plugin-syntax-import-meta": "^7.2.0",
     "@babel/preset-env": "^7.3.1",
     "@gitlab/csslab": "^1.8.0",
-    "@gitlab/svgs": "^1.51.0",
+    "@gitlab/svgs": "^1.52.0",
     "@gitlab/ui": "^2.0.2",
     "apollo-boost": "^0.1.20",
     "apollo-client": "^2.4.5",

spec/controllers/projects/pages_domains_controller_spec.rb

@@ -23,12 +23,27 @@ describe Projects::PagesDomainsController do
   end
 
   describe 'GET show' do
-    it "displays the 'show' page" do
+    def make_request
       get(:show, params: request_params.merge(id: pages_domain.domain))
+    end
 
+    it "displays the 'show' page" do
+      make_request
       expect(response).to have_gitlab_http_status(200)
       expect(response).to render_template('show')
     end
+
+    context 'when user is developer' do
+      before do
+        project.add_developer(user)
+      end
+
+      it 'renders 404 page' do
+        make_request
+
+        expect(response).to have_gitlab_http_status(404)
+      end
+    end
   end
 
   describe 'GET new' do

yarn.lock

@@ -653,10 +653,10 @@
     eslint-plugin-promise "^4.0.1"
     eslint-plugin-vue "^5.0.0"
 
-"@gitlab/svgs@^1.51.0":
-  version "1.51.0"
-  resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.51.0.tgz#1b608f68dfb74284401b1cbdb823440f6e8b0091"
-  integrity sha512-B1Wdhfy5ZClkHuaaCUUZyOBF8CFxxHqxGGhveRekOowtlMExa3tx+YkqNa5XPsEVMF6Aqnh8evQmmN4b+zrHVQ==
+"@gitlab/svgs@^1.52.0":
+  version "1.52.0"
+  resolved "https://registry.yarnpkg.com/@gitlab/svgs/-/svgs-1.52.0.tgz#870b0112a18b10d2cde5470a48b05025193cd207"
+  integrity sha512-xqDYIaSY1MJuCa7lRIDTTPoXn6x57So2qchxwmELE+SAJxlYlpYgDKCNWcGawhyTZRDZuG/qFBWp0sMeTQD//A==
 
 "@gitlab/ui@^2.0.2":
   version "2.0.2"