Commit 1527debe authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Rename group path to URL on group edit page

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 3a75f033
= render 'groups/settings/export', group: @group = render 'groups/settings/export', group: @group
.sub-section .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_for @group, html: { multipart: true, class: 'gl-show-field-errors' }, authenticity_token: true do |f|
= form_errors(@group) = form_errors(@group)
.form-group .form-group
%p %p
= s_('GroupSettings|Changing group path can have unintended side effects.') = s_('GroupSettings|Changing group URL can have unintended side effects.')
= succeed '.' do = succeed '.' do
= link_to _('Learn more'), help_page_path('user/group/index', anchor: 'changing-a-groups-path'), target: '_blank' = link_to _('Learn more'), help_page_path('user/group/index', anchor: 'changing-a-groups-path'), target: '_blank'
...@@ -20,10 +20,10 @@ ...@@ -20,10 +20,10 @@
= f.text_field :path, placeholder: 'open-source', class: 'form-control', = f.text_field :path, placeholder: 'open-source', class: 'form-control',
autofocus: local_assigns[:autofocus] || false, required: true, autofocus: local_assigns[:autofocus] || false, required: true,
pattern: Gitlab::PathRegex::NAMESPACE_FORMAT_REGEX_JS, 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}" "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 .sub-section
%h4.warning-title= s_('GroupSettings|Transfer group') %h4.warning-title= s_('GroupSettings|Transfer group')
......
...@@ -31,11 +31,11 @@ ...@@ -31,11 +31,11 @@
= _('Group path is already taken. Suggestions: ') = _('Group path is already taken. Suggestions: ')
%span.gl-path-suggestions %span.gl-path-suggestions
%p.validation-success.gl-field-success.field-validation.hide= _('Group path is available.') %p.validation-success.gl-field-success.field-validation.hide= _('Group path is available.')
%p.validation-pending.gl-field-error-ignore.field-validation.hide= _('Checking group path availability...') %p.validation-pending.gl-field-error-ignore.field-validation.hide= _('Checking group URL availability...')
- if @group.persisted? - if @group.persisted?
.alert.alert-warning.gl-mt-3 .alert.alert-warning.gl-mt-3
= _('Changing group path can have unintended side effects.') = _('Changing group URL can have unintended side effects.')
= succeed '.' do = succeed '.' do
= link_to _('Learn more'), help_page_path('user/group/index', anchor: 'changing-a-groups-path'), target: '_blank' = link_to _('Learn more'), help_page_path('user/group/index', anchor: 'changing-a-groups-path'), target: '_blank'
......
---
title: Consistent labels for new/edit group URL
merge_request: 38180
author:
type: changed
...@@ -443,7 +443,7 @@ access further configurations for your group. ...@@ -443,7 +443,7 @@ access further configurations for your group.
#### Changing a group's path #### Changing a group's path
Changing a group's path can have unintended side effects. Read Changing a group's path (group URL) can have unintended side effects. Read
[how redirects will behave](../project/index.md#redirects-when-changing-repository-paths) [how redirects will behave](../project/index.md#redirects-when-changing-repository-paths)
before proceeding. before proceeding.
...@@ -451,12 +451,12 @@ If you are vacating the path so it can be claimed by another group or user, ...@@ -451,12 +451,12 @@ If you are vacating the path so it can be claimed by another group or user,
you may need to rename the group too, since both names and paths must you may need to rename the group too, since both names and paths must
be unique. be unique.
To change your group path: To change your group path (group URL):
1. Navigate to your group's **Settings > General** page. 1. Navigate to your group's **Settings > General** page.
1. Expand the **Path, transfer, remove** section. 1. Expand the **Path, transfer, remove** section.
1. Enter a new name under **Change group path**. 1. Enter a new name under **Change group URL**.
1. Click **Change group path**. 1. Click **Change group URL**.
CAUTION: **Caution:** CAUTION: **Caution:**
It is currently not possible to rename a namespace if it contains a It is currently not possible to rename a namespace if it contains a
......
...@@ -4404,7 +4404,7 @@ msgstr "" ...@@ -4404,7 +4404,7 @@ msgstr ""
msgid "Changing a Release tag is only supported via Releases API. %{linkStart}More information%{linkEnd}" msgid "Changing a Release tag is only supported via Releases API. %{linkStart}More information%{linkEnd}"
msgstr "" msgstr ""
msgid "Changing group path can have unintended side effects." msgid "Changing group URL can have unintended side effects."
msgstr "" msgstr ""
msgid "Channel handle (e.g. town-square)" msgid "Channel handle (e.g. town-square)"
...@@ -4488,6 +4488,9 @@ msgstr "" ...@@ -4488,6 +4488,9 @@ msgstr ""
msgid "Checking branch availability..." msgid "Checking branch availability..."
msgstr "" msgstr ""
msgid "Checking group URL availability..."
msgstr ""
msgid "Checking group path availability..." msgid "Checking group path availability..."
msgstr "" msgstr ""
...@@ -11947,10 +11950,10 @@ msgstr "" ...@@ -11947,10 +11950,10 @@ msgstr ""
msgid "GroupSettings|Cannot update the path because there are projects under this group that contain Docker images in their Container Registry. Please remove the images from your projects first and try again." msgid "GroupSettings|Cannot update the path because there are projects under this group that contain Docker images in their Container Registry. Please remove the images from your projects first and try again."
msgstr "" msgstr ""
msgid "GroupSettings|Change group path" msgid "GroupSettings|Change group URL"
msgstr "" msgstr ""
msgid "GroupSettings|Changing group path can have unintended side effects." msgid "GroupSettings|Changing group URL can have unintended side effects."
msgstr "" msgstr ""
msgid "GroupSettings|Custom project templates" msgid "GroupSettings|Custom project templates"
...@@ -11992,7 +11995,7 @@ msgstr "" ...@@ -11992,7 +11995,7 @@ msgstr ""
msgid "GroupSettings|Pipeline settings was updated for the group" msgid "GroupSettings|Pipeline settings was updated for the group"
msgstr "" msgstr ""
msgid "GroupSettings|Please choose a group path with no special characters." msgid "GroupSettings|Please choose a group URL with no special characters."
msgstr "" msgstr ""
msgid "GroupSettings|Prevent sharing a project within %{group} with other groups" msgid "GroupSettings|Prevent sharing a project within %{group} with other groups"
......
...@@ -158,7 +158,7 @@ RSpec.describe 'Edit group settings' do ...@@ -158,7 +158,7 @@ RSpec.describe 'Edit group settings' do
page.within('.gs-advanced') do page.within('.gs-advanced') do
fill_in 'group_path', with: new_group_path fill_in 'group_path', with: new_group_path
click_button 'Change group path' click_button 'Change group URL'
end end
end end
......
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