diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-02-26 15:32:45 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-02-26 15:32:45 +0300 |
| commit | aa868886437cfe6b2110cb5fe927bb90078a081e (patch) | |
| tree | 78dd5902a206d38063c60455b50de1f2048fdb56 | |
| parent | cb567131679be52d1d41da6ff580f1530242b72e (diff) | |
| parent | f31489204e402216483b1829cb1fdc9c8b0f2fc0 (diff) | |
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
| -rw-r--r-- | app/views/projects/pages/_https_only.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/patch-45.yml | 5 | ||||
| -rw-r--r-- | spec/features/projects/pages_spec.rb | 4 |
3 files changed, 8 insertions, 3 deletions
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 72faeba92ee..f564ae34f11 100644 --- a/spec/features/projects/pages_spec.rb +++ b/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 |