Merge branch 'john_long-update_project_pages_settings' into 'master'

Fix project pages settings size limit form

See merge request gitlab-org/gitlab!45054

app/views/projects/pages/_pages_settings.html.haml

 = form_for @project, url: project_pages_path(@project), html: { class: 'inline', title: pages_https_only_title } do |f|
+  = render_if_exists 'shared/pages/max_pages_size_input', form: f
+
   - if Gitlab.config.pages.external_http || Gitlab.config.pages.external_https
-    = render_if_exists 'shared/pages/max_pages_size_input', form: f
 
     .form-group
       .form-check
@@ -9,5 +10,5 @@
           %strong
             = s_('GitLabPages|Force HTTPS (requires valid certificates)')
 
-    .gl-mt-3
-      = f.submit s_('GitLabPages|Save'), class: 'btn btn-success'
+  .gl-mt-3
+    = f.submit s_('GitLabPages|Save'), class: 'btn btn-success gl-button'

changelogs/unreleased/john_long-update_project_pages_settings.yml

+---
+title: Allow size limit to be available by default in the project pages settings form
+merge_request: 45054
+author:
+type: fixed

spec/features/projects/pages_spec.rb

@@ -336,7 +336,7 @@ RSpec.shared_examples 'pages settings editing' do
 
         expect(page).not_to have_field(:project_pages_https_only)
         expect(page).not_to have_content('Force HTTPS (requires valid certificates)')
-        expect(page).not_to have_button('Save')
+        expect(page).to have_button('Save')
       end
     end
   end