Commit 810851f5740599dc8b1419dcf817bac48ee967fc
1 parent
5dae40f5
Exists in
master
and in
4 other branches
Style updates
Change-Id: Ib4eb533dff5c722fe559330e4aa71b5d5baf6fb8
Showing
1 changed file
with
6 additions
and
3 deletions
Show diff stats
app/models/user.rb
| @@ -207,7 +207,11 @@ class User < ActiveRecord::Base | @@ -207,7 +207,11 @@ class User < ActiveRecord::Base | ||
| 207 | end | 207 | end |
| 208 | 208 | ||
| 209 | def defaults | 209 | def defaults |
| 210 | - { projects_limit: Gitlab.config.gitlab.default_projects_limit, can_create_group: Gitlab.config.gitlab.default_can_create_group, theme_id: Gitlab::Theme::BASIC } | 210 | + { |
| 211 | + projects_limit: Gitlab.config.gitlab.default_projects_limit, | ||
| 212 | + can_create_group: Gitlab.config.gitlab.default_can_create_group, | ||
| 213 | + theme_id: Gitlab::Theme::BASIC | ||
| 214 | + } | ||
| 211 | end | 215 | end |
| 212 | end | 216 | end |
| 213 | 217 | ||
| @@ -379,12 +383,11 @@ class User < ActiveRecord::Base | @@ -379,12 +383,11 @@ class User < ActiveRecord::Base | ||
| 379 | end | 383 | end |
| 380 | end | 384 | end |
| 381 | 385 | ||
| 382 | - :private | 386 | + private |
| 383 | 387 | ||
| 384 | def with_defaults | 388 | def with_defaults |
| 385 | User.defaults.each do |k,v| | 389 | User.defaults.each do |k,v| |
| 386 | self.send("#{k}=",v) | 390 | self.send("#{k}=",v) |
| 387 | end | 391 | end |
| 388 | end | 392 | end |
| 389 | - | ||
| 390 | end | 393 | end |