Merge branch 'patch-45' into 'master'

Fix incorrect checkbox description. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/56519

Closes #56519

See merge request gitlab-org/gitlab-ce!25392

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

@@ -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

changelogs/unreleased/patch-45.yml

+---
+title: Fix incorrect Pages Domains checkbox description.
+merge_request: 25392
+author: Anton Melser
+type: other

spec/features/projects/pages_spec.rb

@@ -212,7 +212,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
 
@@ -261,7 +261,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