Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSenorsen <sen@senorsen.com>2015-04-13 19:28:49 +0300
committerSenorsen <sen@senorsen.com>2015-04-14 14:42:48 +0300
commit7b28218f96d14c9650484a183ffab3b2132b05db (patch)
treea79cbd394f52a00ba69b1d9b9f192d7ce0b35082 /app/views/profiles/emails
parentae6d0aaae0d8f6251b30a8e5243a98f083f0cac9 (diff)
Allow user to choose which email to be public
This commit allows user to show one of their emails in profile page, or don't show email in this page.
Diffstat (limited to 'app/views/profiles/emails')
-rw-r--r--app/views/profiles/emails/index.html.haml4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/views/profiles/emails/index.html.haml b/app/views/profiles/emails/index.html.haml
index 9d8f33cbbaa..09f290429ea 100644
--- a/app/views/profiles/emails/index.html.haml
+++ b/app/views/profiles/emails/index.html.haml
@@ -20,9 +20,13 @@
%li
%strong= @primary
%span.label.label-success Primary Email
+ - if @primary === @public_email
+ %span.label.label-info Public Email
- @emails.each do |email|
%li
%strong= email.email
+ - if email.email === @public_email
+ %span.label.label-info Public Email
%span.cgray
added #{time_ago_with_tooltip(email.created_at)}
= link_to 'Remove', profile_email_path(email), data: { confirm: 'Are you sure?'}, method: :delete, class: 'btn btn-sm btn-remove pull-right'