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

Merge branch 'public-profile-info' into 'master'
9a2fec52 · Dmitriy Zaporozhets · bcea7ba3 · 98d697a1 · 9a2fec52
Commit 9a2fec52 authored Jun 07, 2014 by Dmitriy Zaporozhets
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

show.html.haml app/views/profiles/show.html.haml +6 -0

No files found.
--- a/app/views/profiles/show.html.haml
+++ b/app/views/profiles/show.html.haml
@@ -86,5 +86,11 @@
              %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"

+      - 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
    = f.submit 'Save changes', class: "btn btn-save"