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
path: root/app/views
diff options
context:
space:
mode:
authorRobin Bobbitt <ryehle@us.ibm.com>2017-06-06 18:39:54 +0300
committerRobin Bobbitt <ryehle@us.ibm.com>2017-06-07 18:13:57 +0300
commit469acd190e497cda8516da0ee481f33e038d7e9e (patch)
tree7b2fd577757c49570fc353a02a23533a0674d8fa /app/views
parent8fdba5fac2a5fb4ce17a11580e94a85257e76e2c (diff)
Sync email address from specified omniauth provider
Diffstat (limited to 'app/views')
-rw-r--r--app/views/profiles/show.html.haml4
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