Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kazuhiko Shiozaki
gitlab-ce
Commits
76dca50a
Commit
76dca50a
authored
Jun 26, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix password change. Fix test settings
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
8fee5a05
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
app/controllers/profiles/passwords_controller.rb
app/controllers/profiles/passwords_controller.rb
+1
-1
config/initializers/1_settings.rb
config/initializers/1_settings.rb
+1
-1
No files found.
app/controllers/profiles/passwords_controller.rb
View file @
76dca50a
...
@@ -76,6 +76,6 @@ class Profiles::PasswordsController < ApplicationController
...
@@ -76,6 +76,6 @@ class Profiles::PasswordsController < ApplicationController
end
end
def
user_params
def
user_params
params
.
require
(
:user
).
permit
(
:password
,
:password_confirmation
)
params
.
require
(
:user
).
permit
(
:
current_password
,
:
password
,
:password_confirmation
)
end
end
end
end
config/initializers/1_settings.rb
View file @
76dca50a
...
@@ -150,6 +150,6 @@ Settings['extra'] ||= Settingslogic.new({})
...
@@ -150,6 +150,6 @@ Settings['extra'] ||= Settingslogic.new({})
#
#
if
Rails
.
env
.
test?
if
Rails
.
env
.
test?
Settings
.
gitlab
[
'default_projects_limit'
]
=
42
Settings
.
gitlab
[
'default_projects_limit'
]
=
42
Settings
.
gitlab
[
'default_can_create_group'
]
=
fals
e
Settings
.
gitlab
[
'default_can_create_group'
]
=
tru
e
Settings
.
gitlab
[
'default_can_create_team'
]
=
false
Settings
.
gitlab
[
'default_can_create_team'
]
=
false
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment