diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-21 03:09:18 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-21 03:09:18 +0300 |
| commit | 1ccf61bdccd3f0cbcabd7fe335542014f465f46b (patch) | |
| tree | f6eb90ccf27bb2193251d1617e7b655429eb2ac6 /app/views/admin | |
| parent | 68f1860e6f1f9e8441c434f4e62238c359ce8c7c (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/admin')
| -rw-r--r-- | app/views/admin/application_settings/_protected_paths.html.haml | 2 | ||||
| -rw-r--r-- | app/views/admin/application_settings/network.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/admin/application_settings/_protected_paths.html.haml b/app/views/admin/application_settings/_protected_paths.html.haml index f4d40e10f36..0220570daa9 100644 --- a/app/views/admin/application_settings/_protected_paths.html.haml +++ b/app/views/admin/application_settings/_protected_paths.html.haml @@ -6,7 +6,7 @@ .bs-callout.bs-callout-danger - relative_url_link = 'https://docs.gitlab.com/ee/user/admin_area/settings/protected_paths.html#migrate-settings-from-gitlab-123-and-earlier' - relative_url_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: relative_url_link } - = _("Omnibus Protected Paths throttle is active. From 12.4, Omnibus throttle is deprecated and will be removed in a future release. Please read the %{relative_url_link_start}Migrating Protected Paths documentation%{relative_url_link_end}.").html_safe % { relative_url_link_start: relative_url_link_start, relative_url_link_end: '</a>'.html_safe } + = _("Omnibus Protected Paths throttle is active, and takes priority over these settings. From 12.4, Omnibus throttle is deprecated and will be removed in a future release. Please read the %{relative_url_link_start}Migrating Protected Paths documentation%{relative_url_link_end}.").html_safe % { relative_url_link_start: relative_url_link_start, relative_url_link_end: '</a>'.html_safe } .form-group .form-check diff --git a/app/views/admin/application_settings/network.html.haml b/app/views/admin/application_settings/network.html.haml index 7bd51172195..8d88dedf832 100644 --- a/app/views/admin/application_settings/network.html.haml +++ b/app/views/admin/application_settings/network.html.haml @@ -42,7 +42,7 @@ %button.btn.btn-default.js-settings-toggle{ type: 'button' } = expanded_by_default? ? _('Collapse') : _('Expand') %p - = _('Configure paths to be protected by Rack Attack. A web server restart is required after changing these settings.') + = _('Configure paths to be protected by Rack Attack.') .settings-content = render 'protected_paths' |