diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-12 06:13:31 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-12 06:13:31 +0300 |
| commit | 721529ce185614db20618132eae45dc4aa3d9921 (patch) | |
| tree | ffeb84f02cf42898e9a7dbd36ff474e43fc98890 /app/views | |
| parent | ec14b0b4f853fdb94b0b3fe720a8d8440b2e77eb (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin/application_settings/_pages.html.haml | 7 | ||||
| -rw-r--r-- | app/views/projects/pages/_header.html.haml | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/app/views/admin/application_settings/_pages.html.haml b/app/views/admin/application_settings/_pages.html.haml index 5ef8a24ba39..cf43d3ddeca 100644 --- a/app/views/admin/application_settings/_pages.html.haml +++ b/app/views/admin/application_settings/_pages.html.haml @@ -22,6 +22,13 @@ - pages_link_url = help_page_path('administration/pages/index', anchor: 'set-maximum-size-of-gitlab-pages-site-in-a-project') - pages_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: pages_link_url } = s_('AdminSettings|Set the maximum size of GitLab Pages per project (0 for unlimited). %{link_start}Learn more.%{link_end}').html_safe % { link_start: pages_link_start, link_end: '</a>'.html_safe } + .form-group + = f.label :max_pages_custom_domains_per_project, s_('AdminSettings|Maximum number of custom domains per project'), class: 'label-bold' + = f.number_field :max_pages_custom_domains_per_project, class: 'form-control gl-form-input' + .form-text.text-muted + - pages_link_url = help_page_path('administration/pages/index', anchor: 'set-maximum-number-of-gitlab-pages-custom-domains-for-a-project') + - pages_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: pages_link_url } + = s_('AdminSettings|Set the maximum number of GitLab Pages custom domains per project (0 for unlimited). %{link_start}Learn more.%{link_end}').html_safe % { link_start: pages_link_start, link_end: '</a>'.html_safe } %h5 = s_("AdminSettings|Configure Let's Encrypt") %p diff --git a/app/views/projects/pages/_header.html.haml b/app/views/projects/pages/_header.html.haml index da35f2fdf09..cf51796e878 100644 --- a/app/views/projects/pages/_header.html.haml +++ b/app/views/projects/pages/_header.html.haml @@ -1,4 +1,4 @@ -- can_add_new_domain = can?(current_user, :update_pages, @project) && (Gitlab.config.pages.external_http || Gitlab.config.pages.external_https) +- can_add_new_domain = can_create_pages_custom_domains?(current_user, @project) %h1.page-title.gl-font-size-h-display.with-button = s_('GitLabPages|Pages') |