Commit a0411d92 authored by Martin Wortschack's avatar Martin Wortschack

Merge branch 'john_long-update_project_pages_settings' into 'master'

Fix project pages settings size limit form

See merge request gitlab-org/gitlab!45054
parents 3ffbbaa6 02bec1da
= form_for @project, url: project_pages_path(@project), html: { class: 'inline', title: pages_https_only_title } do |f| = form_for @project, url: project_pages_path(@project), html: { class: 'inline', title: pages_https_only_title } do |f|
- if Gitlab.config.pages.external_http || Gitlab.config.pages.external_https
= render_if_exists 'shared/pages/max_pages_size_input', form: f = render_if_exists 'shared/pages/max_pages_size_input', form: f
- if Gitlab.config.pages.external_http || Gitlab.config.pages.external_https
.form-group .form-group
.form-check .form-check
= f.check_box :pages_https_only, class: 'form-check-input', disabled: pages_https_only_disabled? = f.check_box :pages_https_only, class: 'form-check-input', disabled: pages_https_only_disabled?
...@@ -10,4 +11,4 @@ ...@@ -10,4 +11,4 @@
= s_('GitLabPages|Force HTTPS (requires valid certificates)') = s_('GitLabPages|Force HTTPS (requires valid certificates)')
.gl-mt-3 .gl-mt-3
= f.submit s_('GitLabPages|Save'), class: 'btn btn-success' = f.submit s_('GitLabPages|Save'), class: 'btn btn-success gl-button'
---
title: Allow size limit to be available by default in the project pages settings form
merge_request: 45054
author:
type: fixed
...@@ -336,7 +336,7 @@ RSpec.shared_examples 'pages settings editing' do ...@@ -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_field(:project_pages_https_only)
expect(page).not_to have_content('Force HTTPS (requires valid certificates)') 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 end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment