summaryrefslogtreecommitdiff
path: root/app/views/profiles/show.html.haml
diff options
context:
space:
mode:
Diffstat (limited to 'app/views/profiles/show.html.haml')
-rw-r--r--app/views/profiles/show.html.haml8
1 files changed, 6 insertions, 2 deletions
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml
index 523a07db400..69598e799e5 100644
--- a/app/views/profiles/show.html.haml
+++ b/app/views/profiles/show.html.haml
@@ -30,11 +30,15 @@
%span.help-block.light
Email is read-only for LDAP user
- else
- = f.text_field :email, class: "form-control", required: true
+ - if @user.temp_oauth_email?
+ = f.text_field :email, class: "form-control", required: true, value: nil
+ - else
+ = f.text_field :email, class: "form-control", required: true
- if @user.unconfirmed_email.present?
%span.help-block
- We sent confirmation email to
+ Please click the link in the confirmation email before continuing, it was send to
%strong #{@user.unconfirmed_email}
+
- else
%span.help-block We also use email for avatar detection if no avatar is uploaded.
.form-group