diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-11 00:09:24 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-11 00:09:24 +0300 |
| commit | 02c3b2af448be6a5004e8d833cbcbf8e5f185210 (patch) | |
| tree | 27359dc5c21a8901c9eb95a0101cb97087b1f4ac /config | |
| parent | 577bb49691b11bc8ebae3a4966153ed39af60d87 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/feature_flags/development/group_ci_cd_analytics_page.yml | 2 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/config/feature_flags/development/group_ci_cd_analytics_page.yml b/config/feature_flags/development/group_ci_cd_analytics_page.yml index 9f25ca7e6ad..1ee7bda169b 100644 --- a/config/feature_flags/development/group_ci_cd_analytics_page.yml +++ b/config/feature_flags/development/group_ci_cd_analytics_page.yml @@ -5,4 +5,4 @@ rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/292601 milestone: '13.8' type: development group: group::release -default_enabled: false +default_enabled: true diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 2d8bab50635..e15e035b513 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -819,6 +819,7 @@ Settings.forti_token_cloud['enabled'] = false if Settings.forti_token_cloud['ena Settings['extra'] ||= Settingslogic.new({}) Settings.extra['matomo_site_id'] ||= Settings.extra['piwik_site_id'] if Settings.extra['piwik_site_id'].present? Settings.extra['matomo_url'] ||= Settings.extra['piwik_url'] if Settings.extra['piwik_url'].present? +Settings.extra['matomo_disable_cookies'] = false if Settings.extra['matomo_disable_cookies'].nil? # # Rack::Attack settings |