From f31489204e402216483b1829cb1fdc9c8b0f2fc0 Mon Sep 17 00:00:00 2001
From: Anton Melser <anton@melser.org>
Date: Tue, 19 Feb 2019 12:55:02 +0000
Subject: [PATCH] Fix incorrect Pages Domains HTTPS checkkbox desc

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/56519
---
 app/views/projects/pages/_https_only.html.haml | 2 +-
 changelogs/unreleased/patch-45.yml             | 5 +++++
 spec/features/projects/pages_spec.rb           | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 changelogs/unreleased/patch-45.yml

diff --git a/app/views/projects/pages/_https_only.html.haml b/app/views/projects/pages/_https_only.html.haml
index ce3ef29c32e..74478ee011c 100644
--- a/app/views/projects/pages/_https_only.html.haml
+++ b/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
diff --git a/changelogs/unreleased/patch-45.yml b/changelogs/unreleased/patch-45.yml
new file mode 100644
index 00000000000..94fa1d29b32
--- /dev/null
+++ b/changelogs/unreleased/patch-45.yml
@@ -0,0 +1,5 @@
+---
+title: Fix incorrect Pages Domains checkbox description.
+merge_request: 25392
+author: Anton Melser
+type: other
diff --git a/spec/features/projects/pages_spec.rb b/spec/features/projects/pages_spec.rb
index 435fb229b69..0d2a4ec1c8b 100644
--- a/spec/features/projects/pages_spec.rb
+++ b/spec/features/projects/pages_spec.rb
@@ -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