From d51618b9a1ca72e294a264739764a5d7d3727ac3 Mon Sep 17 00:00:00 2001 From: Andrew8xx8 Date: Wed, 24 Apr 2013 14:12:56 +0400 Subject: [PATCH 1/3] New settings added to enable or disable project features by default Conflicts: config/gitlab.yml.example config/initializers/1_settings.rb --- config/gitlab.yml.example | 7 +++++++ config/initializers/1_settings.rb | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 10fe1245115..9d5ce48d152 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -37,6 +37,13 @@ production: &base # signup_enabled: true # default: false - Account passwords are not sent via the email if signup is enabled. # username_changing_enabled: false # default: true - User can change her username/namespace + ## Default project features settings + default_projects_features: + issues: true + merge_requests: true + wiki: true + wall: true + snippets: true ## External issues trackers issues_tracker: diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index ac35eef4218..35eac9e13e8 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -60,6 +60,12 @@ Settings.gitlab['url'] ||= Settings.send(:build_gitlab_url) Settings.gitlab['user'] ||= 'git' Settings.gitlab['signup_enabled'] ||= false Settings.gitlab['username_changing_enabled'] = true if Settings.gitlab['username_changing_enabled'].nil? +Settings.gitlab['default_projects_features'] ||= {} +Settings.gitlab.default_projects_features['issues'] = true if Settings.gitlab.default_projects_features['issues'].nil? +Settings.gitlab.default_projects_features['merge_requests'] = true if Settings.gitlab.default_projects_features['merge_requests'].nil? +Settings.gitlab.default_projects_features['wiki'] = true if Settings.gitlab.default_projects_features['wiki'].nil? +Settings.gitlab.default_projects_features['wall'] = true if Settings.gitlab.default_projects_features['wall'].nil? +Settings.gitlab.default_projects_features['snippets'] = true if Settings.gitlab.default_projects_features['snippets'].nil? # # Gravatar From 7907bc819c8492c4bd04090bd267cea568393ea1 Mon Sep 17 00:00:00 2001 From: Andrew8xx8 Date: Wed, 24 Apr 2013 15:49:29 +0400 Subject: [PATCH 2/3] Default values for project features added to create context --- app/contexts/projects/create_context.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/contexts/projects/create_context.rb b/app/contexts/projects/create_context.rb index 56c4e1c51da..f044b1eeb6a 100644 --- a/app/contexts/projects/create_context.rb +++ b/app/contexts/projects/create_context.rb @@ -33,8 +33,11 @@ module Projects end # Disable less important features by default - @project.wall_enabled = false - @project.snippets_enabled = false + @project.issues_enabled = Gitlab.config.gitlab.default_projects_features.issues + @project.wiki_enabled = Gitlab.config.gitlab.default_projects_features.wiki + @project.wall_enabled = Gitlab.config.gitlab.default_projects_features.wall + @project.snippets_enabled = Gitlab.config.gitlab.default_projects_features.snippets + @project.merge_requests_enabled = Gitlab.config.gitlab.default_projects_features.merge_requests @project.creator = current_user From f5b549af2545942c925c92cb148e5ad5efd459b1 Mon Sep 17 00:00:00 2001 From: Andrew8xx8 Date: Fri, 26 Apr 2013 12:02:00 +0400 Subject: [PATCH 3/3] Wall and snippets were disabled by default --- config/gitlab.yml.example | 4 ++-- config/initializers/1_settings.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 9d5ce48d152..0ba8b5d211f 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -42,8 +42,8 @@ production: &base issues: true merge_requests: true wiki: true - wall: true - snippets: true + wall: false + snippets: false ## External issues trackers issues_tracker: diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 35eac9e13e8..be5393b0483 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -64,8 +64,8 @@ Settings.gitlab['default_projects_features'] ||= {} Settings.gitlab.default_projects_features['issues'] = true if Settings.gitlab.default_projects_features['issues'].nil? Settings.gitlab.default_projects_features['merge_requests'] = true if Settings.gitlab.default_projects_features['merge_requests'].nil? Settings.gitlab.default_projects_features['wiki'] = true if Settings.gitlab.default_projects_features['wiki'].nil? -Settings.gitlab.default_projects_features['wall'] = true if Settings.gitlab.default_projects_features['wall'].nil? -Settings.gitlab.default_projects_features['snippets'] = true if Settings.gitlab.default_projects_features['snippets'].nil? +Settings.gitlab.default_projects_features['wall'] = false if Settings.gitlab.default_projects_features['wall'].nil? +Settings.gitlab.default_projects_features['snippets'] = false if Settings.gitlab.default_projects_features['snippets'].nil? # # Gravatar