Commit 76dca50a authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Fix password change. Fix test settings

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 8fee5a05
......@@ -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
......@@ -150,6 +150,6 @@ Settings['extra'] ||= Settingslogic.new({})
#
if Rails.env.test?
Settings.gitlab['default_projects_limit'] = 42
Settings.gitlab['default_can_create_group'] = false
Settings.gitlab['default_can_create_group'] = true
Settings.gitlab['default_can_create_team'] = false
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment