diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-01-19 18:25:38 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-01-19 18:25:38 +0300 |
| commit | 98e1a5b63424b6912de98ee5055d3f9e57e63899 (patch) | |
| tree | 773952fd630e222ec72d368f53e4a238d3d6c839 /app/views/profiles/show.html.haml | |
| parent | 425f8d6f572a3ae47c971a48bfefc9907c7bda55 (diff) | |
Allow LDAP users to change their email if it was not set by the LDAP server
Diffstat (limited to 'app/views/profiles/show.html.haml')
| -rw-r--r-- | app/views/profiles/show.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml index 9459d8a6295..add9a00138b 100644 --- a/app/views/profiles/show.html.haml +++ b/app/views/profiles/show.html.haml @@ -21,10 +21,10 @@ .form-group = f.label :email, class: "control-label" .col-sm-10 - - if @user.ldap_user? + - if @user.ldap_user? && @user.ldap_email? = f.text_field :email, class: "form-control", required: true, readonly: true %span.help-block.light - Email is read-only for LDAP user + Your email address was automatically set based on the LDAP server. - else - if @user.temp_oauth_email? = f.text_field :email, class: "form-control", required: true, value: nil |