BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
a51562d6
Commit
a51562d6
authored
Sep 14, 2013
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix setting default values for user
parent
3fe2558a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
7 deletions
+10
-7
user.rb
app/models/user.rb
+10
-7
No files found.
app/models/user.rb
View file @
a51562d6
...
...
@@ -200,17 +200,18 @@ class User < ActiveRecord::Base
end
def
build_user
(
attrs
=
{},
options
=
{})
user
=
User
.
new
(
defaults
.
merge
(
attrs
),
options
)
# if not as: :admin force default settings
user
.
with_defaults
unless
options
[
:as
]
==
:admin
user
if
options
[
:as
]
==
:admin
User
.
new
(
defaults
.
merge
(
attrs
.
symbolize_keys
),
options
)
else
User
.
new
(
attrs
,
options
).
with_defaults
end
end
def
defaults
{
projects_limit:
Gitlab
.
config
.
gitlab
.
default_projects_limit
,
can_create_group:
Gitlab
.
config
.
gitlab
.
default_can_create_group
,
theme_id:
Gitlab
::
Theme
::
BASIC
theme_id:
Gitlab
::
Theme
::
MARS
}
end
end
...
...
@@ -384,8 +385,10 @@ class User < ActiveRecord::Base
end
def
with_defaults
User
.
defaults
.
each
do
|
k
,
v
|
self
.
send
(
"
#{
k
}
="
,
v
)
User
.
defaults
.
each
do
|
k
,
v
|
self
.
send
(
"
#{
k
}
="
,
v
)
end
self
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