Fix incorrect Pages Domains HTTPS checkkbox desc
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/56519
This commit is contained in:
parent
cccf611509
commit
f31489204e
|
@ -3,7 +3,7 @@
|
|||
.form-check
|
||||
= f.check_box :pages_https_only, class: 'form-check-input', disabled: pages_https_only_disabled?
|
||||
= f.label :pages_https_only, class: pages_https_only_label_class do
|
||||
%strong Force domains with SSL certificates to use HTTPS
|
||||
%strong Force HTTPS (requires valid certificates)
|
||||
|
||||
- unless pages_https_only_disabled?
|
||||
.prepend-top-10
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Fix incorrect Pages Domains checkbox description.
|
||||
merge_request: 25392
|
||||
author: Anton Melser
|
||||
type: other
|
|
@ -233,7 +233,7 @@ describe 'Pages' do
|
|||
|
||||
it 'tries to change the setting' do
|
||||
visit project_pages_path(project)
|
||||
expect(page).to have_content("Force domains with SSL certificates to use HTTPS")
|
||||
expect(page).to have_content("Force HTTPS (requires valid certificates)")
|
||||
|
||||
uncheck :project_pages_https_only
|
||||
|
||||
|
@ -282,7 +282,7 @@ describe 'Pages' do
|
|||
visit project_pages_path(project)
|
||||
|
||||
expect(page).not_to have_field(:project_pages_https_only)
|
||||
expect(page).not_to have_content('Force domains with SSL certificates to use HTTPS')
|
||||
expect(page).not_to have_content('Force HTTPS (requires valid certificates)')
|
||||
expect(page).not_to have_button('Save')
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue