Commit bffa1e657533dcd324042642f30b06dee3f61930
1 parent
42dc33e9
Exists in
master
and in
4 other branches
Respect feature settings submitted via api
Showing
1 changed file
with
12 additions
and
8 deletions
Show diff stats
app/contexts/projects/create_context.rb
| @@ -8,7 +8,18 @@ module Projects | @@ -8,7 +8,18 @@ module Projects | ||
| 8 | # get namespace id | 8 | # get namespace id |
| 9 | namespace_id = params.delete(:namespace_id) | 9 | namespace_id = params.delete(:namespace_id) |
| 10 | 10 | ||
| 11 | - @project = Project.new(params) | 11 | + # Load default feature settings |
| 12 | + default_features = Gitlab.config.gitlab.default_projects_features | ||
| 13 | + | ||
| 14 | + default_opts = { | ||
| 15 | + issues_enabled: default_features.issues, | ||
| 16 | + wiki_enabled: default_features.wiki, | ||
| 17 | + wall_enabled: default_features.wall, | ||
| 18 | + snippets_enabled: default_features.snippets, | ||
| 19 | + merge_requests_enabled: default_features.merge_requests | ||
| 20 | + } | ||
| 21 | + | ||
| 22 | + @project = Project.new(default_opts.merge(params)) | ||
| 12 | 23 | ||
| 13 | # Parametrize path for project | 24 | # Parametrize path for project |
| 14 | # | 25 | # |
| @@ -32,13 +43,6 @@ module Projects | @@ -32,13 +43,6 @@ module Projects | ||
| 32 | @project.namespace_id = current_user.namespace_id | 43 | @project.namespace_id = current_user.namespace_id |
| 33 | end | 44 | end |
| 34 | 45 | ||
| 35 | - # Disable less important features by default | ||
| 36 | - @project.issues_enabled = Gitlab.config.gitlab.default_projects_features.issues | ||
| 37 | - @project.wiki_enabled = Gitlab.config.gitlab.default_projects_features.wiki | ||
| 38 | - @project.wall_enabled = Gitlab.config.gitlab.default_projects_features.wall | ||
| 39 | - @project.snippets_enabled = Gitlab.config.gitlab.default_projects_features.snippets | ||
| 40 | - @project.merge_requests_enabled = Gitlab.config.gitlab.default_projects_features.merge_requests | ||
| 41 | - | ||
| 42 | @project.creator = current_user | 46 | @project.creator = current_user |
| 43 | 47 | ||
| 44 | # Import project from cloneable resource | 48 | # Import project from cloneable resource |