summaryrefslogtreecommitdiff
path: root/app/views/projects
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-05-05 00:16:50 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2023-05-05 00:16:50 +0000
commit9a236e35e2c909af719d5401e0d26a26ab39087b (patch)
treeefef75151a86d543b632d3e0700713edefb0f922 /app/views/projects
parentceb5cdd5c3293d290c1ae42a86175ac4f51b4408 (diff)
downloadgitlab-ce-9a236e35e2c909af719d5401e0d26a26ab39087b.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects')
-rw-r--r--app/views/projects/pages/_access.html.haml4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/views/projects/pages/_access.html.haml b/app/views/projects/pages/_access.html.haml
index 28f04d78861..7f2588134ba 100644
--- a/app/views/projects/pages/_access.html.haml
+++ b/app/views/projects/pages/_access.html.haml
@@ -1,4 +1,6 @@
- if @project.pages_deployed?
+ - pages_url = @project.pages_url(with_unique_domain: true)
+
= render Pajamas::CardComponent.new(card_options: { class: 'gl-mb-5', data: { qa_selector: 'access_page_container' } }, footer_options: { class: 'gl-alert-warning' }) do |c|
- c.header do
= s_('GitLabPages|Access pages')
@@ -8,7 +10,7 @@
= s_('GitLabPages|Your pages are served under:')
%p
- = external_link(@project.pages_url, @project.pages_url)
+ = external_link(pages_url, pages_url)
- @project.pages_domains.each do |domain|
%p