summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-10-14 18:25:34 +0000
committerRémy Coutable <remy@rymai.me>2016-10-14 18:25:34 +0000
commit53181e77d0c838450a1bb442719be7dd73387446 (patch)
tree8fa9c47ff0f5511510efb50fd62316a28e4163f9
parent88f5eb1d01b9490ca5fe6757e1085a4dc0964c1e (diff)
parenteb4a42e0cef5e89b1d01cfa2a401908ffd09874c (diff)
downloadgitlab-ce-53181e77d0c838450a1bb442719be7dd73387446.tar.gz
Merge branch 'refactor/remove_u_prefix' into 'master'
Remove '/u' prefix form username from Account page ## What does this MR do? Removes `/u` prefix for username from Account page Fixes #23323 See merge request !6872
-rw-r--r--app/views/profiles/accounts/show.html.haml4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/profiles/accounts/show.html.haml b/app/views/profiles/accounts/show.html.haml
index c80f22457b4..e2e974ba072 100644
--- a/app/views/profiles/accounts/show.html.haml
+++ b/app/views/profiles/accounts/show.html.haml
@@ -86,11 +86,11 @@
= f.label :username, "Path", class: "label-light"
.input-group
.input-group-addon
- = "#{root_url}u/"
+ = root_url
= f.text_field :username, required: true, class: 'form-control'
.help-block
Current path:
- = "#{root_url}u/#{current_user.username}"
+ = "#{root_url}#{current_user.username}"
.prepend-top-default
= f.button class: "btn btn-warning", type: "submit" do
= icon "spinner spin", class: "hidden loading-username"