Commit 9a2fec52 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'public-profile-info' into 'master'

Public profile info

Show small info about your profile being publicly because you joined public project![Screenshot 2014-06-07 15.17.17](https://dev.gitlab.org/uploads/dzaporozhets/gitlabhq/eecf9a0bdc/Screenshot_2014-06-07_15.17.17.png)

Fixes #1321
parents bcea7ba3 98d697a1
...@@ -86,5 +86,11 @@ ...@@ -86,5 +86,11 @@
%hr %hr
= link_to 'Remove avatar', profile_avatar_path, data: { confirm: "Avatar will be removed. Are you sure?"}, method: :delete, class: "btn btn-remove btn-small remove-avatar" = link_to 'Remove avatar', profile_avatar_path, data: { confirm: "Avatar will be removed. Are you sure?"}, method: :delete, class: "btn btn-remove btn-small remove-avatar"
- if @user.public_profile?
.bs-callout.bs-callout-info
%h4 Public profile
%p Your profile is publicly visible because you joined public project(s)
.form-actions .form-actions
= f.submit 'Save changes', class: "btn btn-save" = f.submit 'Save changes', class: "btn btn-save"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment