Commit 7dbe47f9 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Merge branch '48475-gitlab-pages-settings-regressions' into 'master'

Resolve "GitLab Pages settings regressions"

Closes #48475

See merge request gitlab-org/gitlab-ce!22821
parents 65e5a79c 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) {
......
= 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
= f.label :pages_https_only, class: pages_https_only_label_class do
%strong Force domains with SSL certificates to use HTTPS
.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
- unless pages_https_only_disabled?
.prepend-top-10
......
......@@ -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)}.
---
title: Fixing regression issues on pages settings and details
merge_request: 22821
author:
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment