summaryrefslogtreecommitdiff
path: root/app/views/groups/settings
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-07-30 18:09:39 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-07-30 18:09:39 +0000
commit1b26aaa633642ea33f1fb9d7e8680892c8ca795d (patch)
tree2f472efc1b86f43857082132ed58e2b24e46ab39 /app/views/groups/settings
parente65a1b9830b8746fefd18744a39d559cbf58c99e (diff)
downloadgitlab-ce-1b26aaa633642ea33f1fb9d7e8680892c8ca795d.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/groups/settings')
-rw-r--r--app/views/groups/settings/_advanced.html.haml8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/views/groups/settings/_advanced.html.haml b/app/views/groups/settings/_advanced.html.haml
index 0df82898644..2a3292bf31f 100644
--- a/app/views/groups/settings/_advanced.html.haml
+++ b/app/views/groups/settings/_advanced.html.haml
@@ -1,12 +1,12 @@
= render 'groups/settings/export', group: @group
.sub-section
- %h4.warning-title= s_('GroupSettings|Change group path')
+ %h4.warning-title= s_('GroupSettings|Change group URL')
= form_for @group, html: { multipart: true, class: 'gl-show-field-errors' }, authenticity_token: true do |f|
= form_errors(@group)
.form-group
%p
- = s_('GroupSettings|Changing group path can have unintended side effects.')
+ = s_('GroupSettings|Changing group URL can have unintended side effects.')
= succeed '.' do
= link_to _('Learn more'), help_page_path('user/group/index', anchor: 'changing-a-groups-path'), target: '_blank'
@@ -20,10 +20,10 @@
= f.text_field :path, placeholder: 'open-source', class: 'form-control',
autofocus: local_assigns[:autofocus] || false, required: true,
pattern: Gitlab::PathRegex::NAMESPACE_FORMAT_REGEX_JS,
- title: s_('GroupSettings|Please choose a group path with no special characters.'),
+ title: s_('GroupSettings|Please choose a group URL with no special characters.'),
"data-bind-in" => "#{'create_chat_team' if Gitlab.config.mattermost.enabled}"
- = f.submit s_('GroupSettings|Change group path'), class: 'btn btn-warning'
+ = f.submit s_('GroupSettings|Change group URL'), class: 'btn btn-warning'
.sub-section
%h4.warning-title= s_('GroupSettings|Transfer group')