diff options
| author | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-13 18:12:05 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dzaporozhets@gitlab.com> | 2015-02-13 18:12:05 +0000 |
| commit | f91767db3d0d72f34797fffd9a037e75445a2e57 (patch) | |
| tree | 90b95eaa5f0e37d73223df9428d9267f61a0533e /app/controllers/profiles_controller.rb | |
| parent | 4d9756c1e8e8bb856dac608bc094c809966099ea (diff) | |
| parent | 25e44d05300a6b5b35232b27b4ccb27f47f09a67 (diff) | |
| download | gitlab-ce-f91767db3d0d72f34797fffd9a037e75445a2e57.tar.gz | |
Merge branch 'oauth-password-http' into 'master'
Allow users that signed up via OAuth to set their password in order to use Git over HTTP(S)
See #1982.
There's a similar tooltip for SSH: "Add an SSH key to your profile to pull or push via SSH". These are always shown on-hover, even if the persistent flash above was hidden.
cc @sytse
See merge request !1512
Diffstat (limited to 'app/controllers/profiles_controller.rb')
| -rw-r--r-- | app/controllers/profiles_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/profiles_controller.rb b/app/controllers/profiles_controller.rb index c0b7e2223a2..f7584c03411 100644 --- a/app/controllers/profiles_controller.rb +++ b/app/controllers/profiles_controller.rb @@ -67,7 +67,7 @@ class ProfilesController < ApplicationController params.require(:user).permit( :email, :password, :password_confirmation, :bio, :name, :username, :skype, :linkedin, :twitter, :website_url, :color_scheme_id, :theme_id, - :avatar, :hide_no_ssh_key, + :avatar, :hide_no_ssh_key, :hide_no_password ) end end |