diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-09-20 08:00:08 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-09-20 08:00:08 +0000 |
| commit | 020196a26c8cd2f6e4546b59ee4f22a4df0defbf (patch) | |
| tree | 4049f12a77f15a1f2c2631c0112192936a741114 /app/views | |
| parent | 545f7c01875ae069cf4e6955fda46715b20367c8 (diff) | |
| parent | a7aad63370951e0137dc6a6b99f7d2607e753f82 (diff) | |
| download | gitlab-ce-020196a26c8cd2f6e4546b59ee4f22a4df0defbf.tar.gz | |
Merge branch 'mk-clarify-moving-namespaces' into 'master'
Clarify how to rename username or group path
See merge request gitlab-org/gitlab-ce!13914
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/profiles/accounts/show.html.haml | 4 | ||||
| -rw-r--r-- | app/views/shared/_group_form.html.haml | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/app/views/profiles/accounts/show.html.haml b/app/views/profiles/accounts/show.html.haml index 5d778d67ae7..8abbd828032 100644 --- a/app/views/profiles/accounts/show.html.haml +++ b/app/views/profiles/accounts/show.html.haml @@ -74,7 +74,9 @@ %h4.prepend-top-0.warning-title Change username %p - Changing your username will change path to all personal projects! + Changing your username can have unintended side effects. + = succeed '.' do + = link_to 'Learn more', help_page_path('user/profile/index', anchor: 'changing-your-username'), target: '_blank' .col-lg-8 = form_for @user, url: update_username_profile_path, method: :put, html: {class: "update-username"} do |f| .form-group diff --git a/app/views/shared/_group_form.html.haml b/app/views/shared/_group_form.html.haml index 2e1bd5a088c..d0b9e891b82 100644 --- a/app/views/shared/_group_form.html.haml +++ b/app/views/shared/_group_form.html.haml @@ -22,11 +22,9 @@ - if @group.persisted? .alert.alert-warning.prepend-top-10 - %ul - %li Changing group path can have unintended side effects. - %li Renaming group path will rename directory for all related projects - %li It will change web url for access group and group projects. - %li It will change the git path to repositories under this group. + Changing group path can have unintended side effects. + = succeed '.' do + = link_to 'Learn more', help_page_path('user/group/index', anchor: 'changing-a-groups-path'), target: '_blank' .form-group.group-name-holder = f.label :name, class: 'control-label' do |