Commit f3148920 authored by Anton Melser's avatar Anton Melser

Fix incorrect Pages Domains HTTPS checkkbox desc

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/56519
parent cccf6115
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
.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?
= f.label :pages_https_only, class: pages_https_only_label_class do = 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? - unless pages_https_only_disabled?
.prepend-top-10 .prepend-top-10
......
---
title: Fix incorrect Pages Domains checkbox description.
merge_request: 25392
author: Anton Melser
type: other
...@@ -233,7 +233,7 @@ describe 'Pages' do ...@@ -233,7 +233,7 @@ describe 'Pages' do
it 'tries to change the setting' do it 'tries to change the setting' do
visit project_pages_path(project) 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 uncheck :project_pages_https_only
...@@ -282,7 +282,7 @@ describe 'Pages' do ...@@ -282,7 +282,7 @@ describe 'Pages' do
visit project_pages_path(project) visit project_pages_path(project)
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 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') expect(page).not_to have_button('Save')
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