diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-07 16:51:00 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-07 16:51:00 +0400 |
| commit | 9a2fec52732e7c6a91a26f1f6e5bcb1e1a70f55f (patch) | |
| tree | a0f79d908801ad917d8090245e2a3791e7c7707d /app | |
| parent | bcea7ba331e26c037dda9782f069bfb38f5bb602 (diff) | |
| parent | 98d697a1a6adf2e69831dafb05fc36fdd4b797b6 (diff) | |
Merge branch 'public-profile-info' into 'master'
Public profile info
Show small info about your profile being publicly because you joined public project
Fixes #1321
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/profiles/show.html.haml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml index 69598e799e5..9a4c13af975 100644 --- 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" |