Download as
Browse Code »

Commit 9a2fec52732e7c6a91a26f1f6e5bcb1e1a70f55f

Authored by Dmitriy Zaporozhets
2 parents bcea7ba3 98d697a1
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

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
Showing 1 changed file with 6 additions and 0 deletions   Show diff stats
app/views/profiles/show.html.haml
  Diff comments   View file @9a2fec5
@@ -86,5 +86,11 @@ @@ -86,5 +86,11 @@
86 %hr 86 %hr
87 = 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" 87 = 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"
88 88
  89 + - if @user.public_profile?
  90 + .bs-callout.bs-callout-info
  91 + %h4 Public profile
  92 + %p Your profile is publicly visible because you joined public project(s)
  93 +
  94 +
89 .form-actions 95 .form-actions
90 = f.submit 'Save changes', class: "btn btn-save" 96 = f.submit 'Save changes', class: "btn btn-save"