summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dzaporozhets@gitlab.com>2015-09-15 09:04:17 +0000
committerDmitriy Zaporozhets <dzaporozhets@gitlab.com>2015-09-15 09:04:17 +0000
commitff22868b90dd76b94b7006bb6d3dfd23357b7d5f (patch)
tree254def2012d84f8437515a58856d48d66a0f8efa
parentc99473e57ca90f95c4e31fc1582fb94731257442 (diff)
parent558084f403d2198569537729b471b93befbdbbae (diff)
downloadgitlab-ce-ff22868b90dd76b94b7006bb6d3dfd23357b7d5f.tar.gz
Merge branch 'renasem-btn' into 'master'
Improve project settings button on profile Rename `Edit profile settings` to `profile settings` button Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !1932
-rw-r--r--app/views/users/show.html.haml4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml
index aa4e8722fb1..37d5dba0330 100644
--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -16,8 +16,8 @@
- if @user == current_user
.pull-right.hidden-xs
= link_to profile_path, class: 'btn btn-sm' do
- %i.fa.fa-pencil-square-o
- Edit Profile settings
+ = icon('user')
+ Profile settings
- elsif current_user
.pull-right
%span.dropdown