From 16475bede74c21998502b77ae58397a43cf2d288 Mon Sep 17 00:00:00 2001 From: Sean McGivern Date: Fri, 10 Mar 2017 13:09:24 +0000 Subject: Enable snippets for new projects by default If there is an existing gitlab.yml file with snippets explicitly disabled, they won't be enabled with this change. --- changelogs/unreleased/enable-snippets-by-default.yml | 4 ++++ config/gitlab.yml.example | 2 +- config/initializers/1_settings.rb | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 changelogs/unreleased/enable-snippets-by-default.yml diff --git a/changelogs/unreleased/enable-snippets-by-default.yml b/changelogs/unreleased/enable-snippets-by-default.yml new file mode 100644 index 00000000000..04fa3f7bdae --- /dev/null +++ b/changelogs/unreleased/enable-snippets-by-default.yml @@ -0,0 +1,4 @@ +--- +title: Enable snippets for new projects by default +merge_request: +author: diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index 720df0cac2d..a82368e5d0f 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -89,7 +89,7 @@ production: &base issues: true merge_requests: true wiki: true - snippets: false + snippets: true builds: true container_registry: true diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index b45d0e23080..d049ae9476f 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -221,7 +221,7 @@ Settings.gitlab['session_expire_delay'] ||= 10080 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['snippets'] = false if Settings.gitlab.default_projects_features['snippets'].nil? +Settings.gitlab.default_projects_features['snippets'] = true if Settings.gitlab.default_projects_features['snippets'].nil? Settings.gitlab.default_projects_features['builds'] = true if Settings.gitlab.default_projects_features['builds'].nil? Settings.gitlab.default_projects_features['container_registry'] = true if Settings.gitlab.default_projects_features['container_registry'].nil? Settings.gitlab.default_projects_features['visibility_level'] = Settings.send(:verify_constant, Gitlab::VisibilityLevel, Settings.gitlab.default_projects_features['visibility_level'], Gitlab::VisibilityLevel::PRIVATE) -- cgit v1.2.1