summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorblackst0ne <blackst0ne.ru@gmail.com>2016-10-14 09:40:40 +1100
committerblackst0ne <blackst0ne.ru@gmail.com>2016-10-14 09:40:40 +1100
commit6c7d3a0ee4c4c2b4e0a38fe92cd364c888eda907 (patch)
tree23b8f020d77579e1f5187bf2d7dd91e3c36a4254
parent9bb52e055410524debc220158129af32374a0f38 (diff)
downloadgitlab-ce-6c7d3a0ee4c4c2b4e0a38fe92cd364c888eda907.tar.gz
Remove '/u' prefix form username from Account page
-rw-r--r--CHANGELOG1
-rw-r--r--app/views/profiles/accounts/show.html.haml4
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 99bbd99726d..f933c298b01 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
Please view this file on the master branch, on stable branches it's out of date.
v 8.13.0 (unreleased)
+ - Remove '/u' prefix form username from Account page (blackst0ne)
- Improve Merge When Build Succeeds triggers and execute on pipeline success. (!6675)
- Respond with 404 Not Found for non-existent tags (Linus Thiel)
- Truncate long labels with ellipsis in labels page
diff --git a/app/views/profiles/accounts/show.html.haml b/app/views/profiles/accounts/show.html.haml
index c80f22457b4..8ee643f3bcc 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"