diff options
author | Robin Bobbitt <ryehle@us.ibm.com> | 2017-06-06 11:39:54 -0400 |
---|---|---|
committer | Robin Bobbitt <ryehle@us.ibm.com> | 2017-06-07 11:13:57 -0400 |
commit | 469acd190e497cda8516da0ee481f33e038d7e9e (patch) | |
tree | 7b2fd577757c49570fc353a02a23533a0674d8fa /app/views | |
parent | 8fdba5fac2a5fb4ce17a11580e94a85257e76e2c (diff) | |
download | gitlab-ce-469acd190e497cda8516da0ee481f33e038d7e9e.tar.gz |
Sync email address from specified omniauth provider
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/profiles/show.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml index 4a1438aa68e..fcfd350f0da 100644 --- a/app/views/profiles/show.html.haml +++ b/app/views/profiles/show.html.haml @@ -49,10 +49,10 @@ .form-group = f.label :email, class: "label-light" - - if @user.ldap_user? && @user.ldap_email? + - if @user.external_email? = f.text_field :email, class: "form-control", required: true, readonly: true %span.help-block.light - Your email address was automatically set based on the LDAP server. + Your email address was automatically set based on your #{email_provider_label} account. - else - if @user.temp_oauth_email? = f.text_field :email, class: "form-control", required: true, value: nil |