diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-09-01 14:49:22 +0300 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-09-01 23:12:16 +0300 |
| commit | 411d047d4bea85c711ed7eff88e7364f98d3d613 (patch) | |
| tree | 10a296ad45750b54772b892e68be2a35463a2cd2 /app/controllers/profiles | |
| parent | 89d3f11703a800e22845af29db18d21dfd0ad428 (diff) | |
Merge branch '37202-revert-changes-to-signing-enabled' into 'master'
Rollback changes made to signing_enabled.
Closes #37202
See merge request !13956
Diffstat (limited to 'app/controllers/profiles')
| -rw-r--r-- | app/controllers/profiles/passwords_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/profiles/passwords_controller.rb b/app/controllers/profiles/passwords_controller.rb index c423761ab24..7beb52dd8e8 100644 --- a/app/controllers/profiles/passwords_controller.rb +++ b/app/controllers/profiles/passwords_controller.rb @@ -77,7 +77,7 @@ class Profiles::PasswordsController < Profiles::ApplicationController end def authorize_change_password! - render_404 unless @user.allow_password_authentication? + render_404 if @user.ldap_user? end def user_params |