Allow users that signed up via OAuth to set their password in order to use Git over HTTP(S).

2 files changed, 19 insertions, 13 deletions

diff --git a/app/views/profiles/passwords/edit.html.haml b/app/views/profiles/passwords/edit.html.haml
index 2a7d317aa3e..6b19db4eb5d 100644
--- a/app/views/profiles/passwords/edit.html.haml
+++ b/app/views/profiles/passwords/edit.html.haml
@@ -1,25 +1,30 @@
 %h3.page-title Password
 %p.light
-  Change your password or recover your current one.
+  - if @user.password_automatically_set?
+    Set your password.
+  - else
+    Change your password or recover your current one.
 %hr
 .update-password
   = form_for @user, url: profile_password_path, method: :put, html: { class: 'form-horizontal' }  do |f|
     %div
       %p.slead
-        You must provide current password in order to change it.
-        %br
+        - unless @user.password_automatically_set?
+          You must provide current password in order to change it.
+          %br
         After a successful password update you will be redirected to login page where you should login with your new password
       -if @user.errors.any?
         .alert.alert-danger
           %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'
-          %div
-            = link_to "Forgot your password?", reset_profile_password_path, method: :put
+      - 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'
+            %div
+              = link_to "Forgot your password?", reset_profile_password_path, method: :put
 
       .form-group
         = f.label :password, 'New password', class: 'control-label'
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'