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

Merge branch 'refactor/remove_u_prefix' into 'master'
53181e77 · Rémy Coutable · 88f5eb1d · eb4a42e0 · 53181e77
Commit 53181e77 authored Oct 14, 2016 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

show.html.haml app/views/profiles/accounts/show.html.haml +2 -2

No files found.
--- 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"