summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-10-01 18:06:28 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-10-01 18:06:28 +0000
commited3b1698883bd4ac2c4faf6c05c3a8155748bf91 (patch)
treee4725e36aaee9141e9ac4da66faf8a19edd74c2a /app/views
parent05f4b2fb34dbb051b2ce5ddbc801ec42998c019c (diff)
downloadgitlab-ce-ed3b1698883bd4ac2c4faf6c05c3a8155748bf91.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views')
-rw-r--r--app/views/admin/application_settings/_protected_paths.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/admin/application_settings/_protected_paths.html.haml b/app/views/admin/application_settings/_protected_paths.html.haml
index cfb04562b59..f4d40e10f36 100644
--- a/app/views/admin/application_settings/_protected_paths.html.haml
+++ b/app/views/admin/application_settings/_protected_paths.html.haml
@@ -4,7 +4,7 @@
%fieldset
- if omnibus_protected_paths_throttle?
.bs-callout.bs-callout-danger
- - relative_url_link = 'https://docs.gitlab.com/ee/user/admin_area/settings/protected_paths.html#migrating-from-omnibus'
+ - 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 }