Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
f3148920
Commit
f3148920
authored
Feb 19, 2019
by
Anton Melser
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix incorrect Pages Domains HTTPS checkkbox desc
Fixes
https://gitlab.com/gitlab-org/gitlab-ce/issues/56519
parent
cccf6115
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
3 deletions
+8
-3
app/views/projects/pages/_https_only.html.haml
app/views/projects/pages/_https_only.html.haml
+1
-1
changelogs/unreleased/patch-45.yml
changelogs/unreleased/patch-45.yml
+5
-0
spec/features/projects/pages_spec.rb
spec/features/projects/pages_spec.rb
+2
-2
No files found.
app/views/projects/pages/_https_only.html.haml
View file @
f3148920
...
@@ -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
...
...
changelogs/unreleased/patch-45.yml
0 → 100644
View file @
f3148920
---
title
:
Fix incorrect Pages Domains checkbox description.
merge_request
:
25392
author
:
Anton Melser
type
:
other
spec/features/projects/pages_spec.rb
View file @
f3148920
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment