summaryrefslogtreecommitdiff
path: root/app/controllers/profiles
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-06-26 23:40:08 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-06-26 23:40:08 +0300
commit76dca50abee38e1bff2e551534c2b40bdb9d5082 (patch)
tree7d5477ebcbec294b386cacc66c490561f5a3b2b2 /app/controllers/profiles
parent8fee5a0572372b1d3a69fa1816380eb11182afaf (diff)
downloadgitlab-ce-76dca50abee38e1bff2e551534c2b40bdb9d5082.tar.gz
Fix password change. Fix test settings
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/controllers/profiles')
-rw-r--r--app/controllers/profiles/passwords_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/profiles/passwords_controller.rb b/app/controllers/profiles/passwords_controller.rb
index 60617e4f8ae..0d93f5cbfdf 100644
--- a/app/controllers/profiles/passwords_controller.rb
+++ b/app/controllers/profiles/passwords_controller.rb
@@ -76,6 +76,6 @@ class Profiles::PasswordsController < ApplicationController
end
def user_params
- params.require(:user).permit(:password, :password_confirmation)
+ params.require(:user).permit(:current_password, :password, :password_confirmation)
end
end