diff options
| author | Phil Hughes <me@iamphill.com> | 2017-06-24 12:37:28 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-06-24 12:37:28 +0000 |
| commit | 98b94cbff624a0340a7fab5ed9e16ce5e7079224 (patch) | |
| tree | 59ca911752816ee1001b00ee188b89d59c056dd2 | |
| parent | 6b86ce75cf5b716370611f2bccea2b4590d7ce34 (diff) | |
| parent | b7e6fb9b41a56144b39a494c635e8bbc28c8e341 (diff) | |
| download | gitlab-ce-98b94cbff624a0340a7fab5ed9e16ce5e7079224.tar.gz | |
Merge branch 'fix-profile-show-interpolation' into 'master'
Fix interpolation in app/views/profile/show.html/haml
See merge request !12439
| -rw-r--r-- | app/views/profiles/show.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml index 087ae778b0f..819c98946ab 100644 --- a/app/views/profiles/show.html.haml +++ b/app/views/profiles/show.html.haml @@ -48,7 +48,7 @@ = f.text_field :id, readonly: true, label: 'User ID', wrapper: { class: 'col-md-3' } - if @user.external_email? - = f.text_field :email, required: true, readonly: true, help: 'Your email address was automatically set based on your #{email_provider_label} account.' + = f.text_field :email, required: true, readonly: true, help: "Your email address was automatically set based on your #{email_provider_label} account." - else = f.text_field :email, required: true, value: (@user.email unless @user.temp_oauth_email?), help: user_email_help_text(@user) |