diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-27 21:55:00 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-27 21:55:00 +0000 |
| commit | 53698401fb15d7e69514bb48217711d060fd9e46 (patch) | |
| tree | 7c2592388e7bfe113cfdf07d3abce2806ffccb51 /app/views/profiles | |
| parent | 04d5d2655288eb7abebb844ad75713340578cfdb (diff) | |
| parent | ff30b407545b2b873ffbe9d5d3d603e550013cf3 (diff) | |
| download | gitlab-ce-53698401fb15d7e69514bb48217711d060fd9e46.tar.gz | |
Merge branch 'make_all_profile_public' into 'master'
Make all profile public
https://dev.gitlab.org/gitlab/gitlabhq/issues/1361
See merge request !1219
Diffstat (limited to 'app/views/profiles')
| -rw-r--r-- | app/views/profiles/show.html.haml | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml index 9fdeddfcc7a..c519e52e596 100644 --- a/app/views/profiles/show.html.haml +++ b/app/views/profiles/show.html.haml @@ -100,11 +100,6 @@ %hr = link_to 'Remove avatar', profile_avatar_path, data: { confirm: "Avatar will be removed. Are you sure?"}, method: :delete, class: "btn btn-remove btn-sm remove-avatar" - - if @user.public_profile? - .alert.alert-info - %h4 Public profile - %p Your profile is publicly visible because you joined public project(s) - .row .col-md-7 |