diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-07 17:15:31 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-07 17:15:31 +0300 |
| commit | 650d0bc695eb0f874561b8d4ed3fc86510573fba (patch) | |
| tree | 70da3eb09b3d8f0e34997158272cf36c8e7fe0fa /app/views/profiles/show.html.haml | |
| parent | 5d6e9ea8efa07d5342857de0772b59a4c5092f60 (diff) | |
| parent | e6f58cb87da914f2a424df66b680e19e49dcd2e6 (diff) | |
| download | gitlab-ce-650d0bc695eb0f874561b8d4ed3fc86510573fba.tar.gz | |
Merge branch 'improve-oauth'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
CHANGELOG
Diffstat (limited to 'app/views/profiles/show.html.haml')
| -rw-r--r-- | app/views/profiles/show.html.haml | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml index 26e9f22c3cc..69598e799e5 100644 --- a/app/views/profiles/show.html.haml +++ b/app/views/profiles/show.html.haml @@ -30,7 +30,10 @@ %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 Please click the link in the confirmation email before continuing, it was send to |