diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-04-30 16:17:03 +0200 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-04-30 16:17:03 +0200 |
commit | d386bb780864f4fc36490e19ea654f31bf193d0f (patch) | |
tree | 48adcf65b79c5f1eaf11519007a776568cdd9b01 /app/views/profiles | |
parent | 39a55bdf1a1613f362bcd7da444b291210454160 (diff) | |
download | gitlab-ce-d386bb780864f4fc36490e19ea654f31bf193d0f.tar.gz |
Allow primary email to be set to an email that you've already added.change-primary-email
Diffstat (limited to 'app/views/profiles')
-rw-r--r-- | app/views/profiles/emails/index.html.haml | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/app/views/profiles/emails/index.html.haml b/app/views/profiles/emails/index.html.haml index 09f290429ea..9ef49ef9ec9 100644 --- a/app/views/profiles/emails/index.html.haml +++ b/app/views/profiles/emails/index.html.haml @@ -4,11 +4,15 @@ Your %b Primary Email will be used for avatar detection and web based operations, such as edits and merges. - %br +%p.light Your %b Notification Email will be used for account notifications. - %br +%p.light + Your + %b Public Email + will be displayed on your public profile. +%p.light All email addresses will be used to identify your commits. %hr @@ -20,13 +24,17 @@ %li %strong= @primary %span.label.label-success Primary Email - - if @primary === @public_email + - if @primary === current_user.public_email %span.label.label-info Public Email + - if @primary === current_user.notification_email + %span.label.label-info Notification Email - @emails.each do |email| %li %strong= email.email - - if email.email === @public_email + - if email.email === current_user.public_email %span.label.label-info Public Email + - if email.email === current_user.notification_email + %span.label.label-info Notification 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' |