From 411d047d4bea85c711ed7eff88e7364f98d3d613 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Fri, 1 Sep 2017 11:49:22 +0000 Subject: Merge branch '37202-revert-changes-to-signing-enabled' into 'master' Rollback changes made to signing_enabled. Closes #37202 See merge request !13956 --- app/controllers/profiles/passwords_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/controllers/profiles') 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 -- cgit v1.2.3