kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix password change. Fix test settings

Browse source 
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
Dmitriy Zaporozhets 2014-06-26 23:40:08 +03:00
parent 8fee5a0572
commit 76dca50abe
No known key found for this signature in database
GPG key ID: 627C5F589F467F17
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/profiles/passwords_controller.rb
View file

@ -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

2
config/initializers/1_settings.rb
View file

@ -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