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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
ee0a8b7e
Commit
ee0a8b7e
authored
Nov 09, 2018
by
Scott Hampton
Committed by
Annabel Dunstone Gray
Nov 09, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "GitLab Pages settings regressions"
parent
65e5a79c
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
13 deletions
+17
-13
app/assets/stylesheets/pages/pages.scss
app/assets/stylesheets/pages/pages.scss
+3
-4
app/views/projects/pages/_https_only.html.haml
app/views/projects/pages/_https_only.html.haml
+5
-5
app/views/projects/pages/_list.html.haml
app/views/projects/pages/_list.html.haml
+4
-4
changelogs/unreleased/48475-gitlab-pages-settings-regressions.yml
...gs/unreleased/48475-gitlab-pages-settings-regressions.yml
+5
-0
No files found.
app/assets/stylesheets/pages/pages.scss
View file @
ee0a8b7e
.pages-domain-list
{
&
-item
{
position
:
relative
;
display
:
flex
;
align-items
:
center
;
.domain-status
{
...
...
@@ -44,8 +42,9 @@
}
:first-child
{
border-bottom-left-radius
:
$border-radius-default
;
border-top-left-radius
:
$border-radius-default
;
border-bottom-right-radius
:
0
;
border-top-right-radius
:
0
;
line-height
:
$gl-line-height
;
}
:not
(
:first-child
)
{
...
...
app/views/projects/pages/_https_only.html.haml
View file @
ee0a8b7e
=
form_for
@project
,
url:
namespace_project_pages_path
(
@project
.
namespace
.
becomes
(
Namespace
),
@project
),
html:
{
class:
'inline'
,
title:
pages_https_only_title
}
do
|
f
|
=
f
.
check_box
:pages_https_only
,
class:
'float-left'
,
disabled:
pages_https_only_disabled?
.prepend-left-20
.form-group
.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
...
...
app/views/projects/pages/_list.html.haml
View file @
ee0a8b7e
...
...
@@ -4,9 +4,9 @@
.card
.card-header
Domains (
#{
@domains
.
count
}
)
%ul
.
content-list
.pages-domain-list
{
class:
(
"has-verification-status"
if
verification_enabled
)
}
%ul
.
list-group.list-group-flush
.pages-domain-list
{
class:
(
"has-verification-status"
if
verification_enabled
)
}
-
@domains
.
each
do
|
domain
|
%li
.pages-domain-list-item.
unstyled
%li
.pages-domain-list-item.
list-group-item.d-flex.justify-content-between
-
if
verification_enabled
-
tooltip
,
status
=
domain
.
unverified?
?
[
_
(
'Unverified'
),
'failed'
]
:
[
_
(
'Verified'
),
'success'
]
.domain-status.ci-status-icon.has-tooltip
{
class:
"ci-status-icon-#{status}"
,
title:
tooltip
}
...
...
@@ -16,7 +16,7 @@
=
domain
.
url
=
icon
(
'external-link'
)
-
if
domain
.
subject
%
p
%
div
%span
.badge.badge-gray
Certificate:
#{
domain
.
subject
}
-
if
domain
.
expired?
%span
.badge.badge-danger
Expired
...
...
@@ -24,6 +24,6 @@
=
link_to
'Details'
,
project_pages_domain_path
(
@project
,
domain
),
class:
"btn btn-sm btn-grouped"
=
link_to
'Remove'
,
project_pages_domain_path
(
@project
,
domain
),
data:
{
confirm:
'Are you sure?'
},
method: :delete
,
class:
"btn btn-remove btn-sm btn-grouped"
-
if
verification_enabled
&&
domain
.
unverified?
%li
.
warning-row
%li
.
list-group-item.bs-callout-warning
#{
domain
.
domain
}
is not verified. To learn how to verify ownership, visit your
#{
link_to
'domain details'
,
project_pages_domain_path
(
@project
,
domain
)
}
.
changelogs/unreleased/48475-gitlab-pages-settings-regressions.yml
0 → 100644
View file @
ee0a8b7e
---
title
:
Fixing regression issues on pages settings and details
merge_request
:
22821
author
:
type
:
fixed
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