diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-02-13 15:33:28 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-02-13 16:44:42 +0300 |
| commit | 25e44d05300a6b5b35232b27b4ccb27f47f09a67 (patch) | |
| tree | f46c5753255cae37b492a988ffffd9d1dd4d1f6d /app/views/profiles/passwords/new.html.haml | |
| parent | 529188e4788991961796b1b6131389072ee61efb (diff) | |
Allow users that signed up via OAuth to set their password in order to use Git over HTTP(S).
Diffstat (limited to 'app/views/profiles/passwords/new.html.haml')
| -rw-r--r-- | app/views/profiles/passwords/new.html.haml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/app/views/profiles/passwords/new.html.haml b/app/views/profiles/passwords/new.html.haml index aef7348fd20..8bed6e0dbee 100644 --- a/app/views/profiles/passwords/new.html.haml +++ b/app/views/profiles/passwords/new.html.haml @@ -10,10 +10,11 @@ %ul - @user.errors.full_messages.each do |msg| %li= msg - - .form-group - = f.label :current_password, class: 'control-label' - .col-sm-10= f.password_field :current_password, required: true, class: 'form-control' + + - unless @user.password_automatically_set? + .form-group + = f.label :current_password, class: 'control-label' + .col-sm-10= f.password_field :current_password, required: true, class: 'form-control' .form-group = f.label :password, class: 'control-label' .col-sm-10= f.password_field :password, required: true, class: 'form-control' |