diff options
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/devise/sessions/_oauth_providers.html.haml | 2 | ||||
-rw-r--r-- | app/views/profiles/show.html.haml | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/app/views/devise/sessions/_oauth_providers.html.haml b/app/views/devise/sessions/_oauth_providers.html.haml index 2b1cb9c694f..f4556eea4a2 100644 --- a/app/views/devise/sessions/_oauth_providers.html.haml +++ b/app/views/devise/sessions/_oauth_providers.html.haml @@ -9,5 +9,3 @@ = link_to authbutton(provider, 32), omniauth_authorize_path(resource_name, provider) - else = link_to provider.to_s.titleize, omniauth_authorize_path(resource_name, provider), class: "btn" - %br - %small * Make sure your email address is public 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 |