Commit 526a8ca6 authored by Achilleas Pipinellis's avatar Achilleas Pipinellis

Revise group Pages size UI text

Changelog: other
EE: true
parent 7942b0c3
......@@ -2,4 +2,4 @@
= render_if_exists 'shared/pages/max_pages_size_input', form: f
.gl-mt-3
= f.submit s_('GitLabPages|Save'), class: 'btn gl-button btn-confirm'
= f.submit s_('GitLabPages|Save changes'), class: 'btn gl-button btn-confirm'
= form_for @project, url: project_pages_path(@project), html: { class: 'inline', title: pages_https_only_title } do |f|
= render_if_exists 'shared/pages/max_pages_size_input', form: f
- if can?(current_user, :update_max_pages_size)
= render_if_exists 'shared/pages/max_pages_size_input', form: f
.gl-mt-3
= f.submit s_('GitLabPages|Save changes'), class: 'btn btn-confirm gl-button'
- if Gitlab.config.pages.external_http || Gitlab.config.pages.external_https
......@@ -15,4 +18,4 @@
= s_("GitLabPages|When enabled, all attempts to visit your website through HTTP are automatically redirected to HTTPS using a response with status code 301. Requires a valid certificate for all domains. %{docs_link_start}Learn more.%{link_end}").html_safe % { docs_link_start: docs_link_start, link_end: link_end }
.gl-mt-3
= f.submit s_('GitLabPages|Save'), class: 'btn btn-confirm gl-button'
= f.submit s_('GitLabPages|Save changes'), class: 'btn btn-confirm gl-button'
......@@ -662,24 +662,27 @@ Follow the steps below to configure the proxy listener of GitLab Pages.
1. [Reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure).
### Override maximum pages size per project or group **(PREMIUM SELF)**
## Override maximum pages size per project or group **(PREMIUM SELF)**
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/16610) in GitLab 12.7.
NOTE:
Only GitLab admin users are able to view and override the **Maximum size of Pages** setting.
Only GitLab administrators are able to view and override the **Maximum size of Pages** setting.
To override the global maximum pages size for a specific project:
1. Go to your project's **Settings > Pages** page.
1. Edit the **Maximum size of pages**.
1. Click **Save changes**.
1. On the top bar, select **Menu > Projects** and find your project.
1. On the left sidebar, select **Settings > Pages**.
1. Enter a value under **Maximum size of pages** in MB.
1. Select **Save changes**.
To override the global maximum pages size for a specific group:
1. Go to your group's **Settings > General** page and expand **Pages**.
1. Edit the **Maximum size of pages**.
1. Click **Save changes**.
1. On the top bar, select **Menu > Groups** and find your group.
1. On the left sidebar, select **Settings > General**.
1. Expand **Pages**.
1. Enter a value under **Maximum size of pages** in MB.
1. Select **Save changes**.
## Running GitLab Pages on a separate server
......
......@@ -7,7 +7,9 @@
= _('Pages')
%button.btn.gl-button.js-settings-toggle{ type: 'button' }
= expanded ? _('Collapse') : _('Expand')
%p
= _('Size settings for static websites')
- pages_link_url = help_page_path('administration/pages/index', anchor: 'override-maximum-pages-size-per-project-or-group')
- pages_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: pages_link_url }
%p= s_('GroupSettings|Set the maximum size of GitLab Pages for this group. %{link_start}Learn more.%{link_end}').html_safe % { link_start: pages_link_start, link_end: '</a>'.html_safe }
.settings-content
= render 'groups/settings/pages_settings'
......@@ -15169,7 +15169,7 @@ msgstr ""
msgid "GitLabPages|Removing pages will prevent them from being exposed to the outside world."
msgstr ""
msgid "GitLabPages|Save"
msgid "GitLabPages|Save changes"
msgstr ""
msgid "GitLabPages|Something went wrong while obtaining the Let's Encrypt certificate for %{domain}. To retry visit your %{link_start}domain details%{link_end}."
......@@ -15940,6 +15940,9 @@ msgstr ""
msgid "GroupSettings|Select a subgroup to use as the source for custom project templates for this group."
msgstr ""
msgid "GroupSettings|Set the maximum size of GitLab Pages for this group. %{link_start}Learn more.%{link_end}"
msgstr ""
msgid "GroupSettings|The Auto DevOps pipeline runs if no alternative CI configuration file is found."
msgstr ""
......@@ -30468,9 +30471,6 @@ msgstr ""
msgid "Size limit per repository (MB)"
msgstr ""
msgid "Size settings for static websites"
msgstr ""
msgid "Skip outdated deployment jobs"
msgstr ""
......
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