diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-26 21:09:18 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-26 21:09:18 +0300 |
| commit | 08931747cc2092734a794980ef13ff67e89a9d8b (patch) | |
| tree | 0ef1c5fd1e60201b52954c1c105b800930d92c90 /config | |
| parent | 2eaa60e4555bb11ad5c0af905217f0fa61cf7cc9 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/feature_flags/development/boards_with_swimlanes.yml | 8 | ||||
| -rw-r--r-- | config/initializers/1_settings.rb | 4 |
2 files changed, 2 insertions, 10 deletions
diff --git a/config/feature_flags/development/boards_with_swimlanes.yml b/config/feature_flags/development/boards_with_swimlanes.yml deleted file mode 100644 index 7080bceb777..00000000000 --- a/config/feature_flags/development/boards_with_swimlanes.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: boards_with_swimlanes -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/218040 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/238222 -milestone: 13.6 -group: group::product planning -type: development -default_enabled: true diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 5bac589415a..d0c4cccd874 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -785,8 +785,8 @@ Settings.forti_authenticator['port'] = 443 if Settings.forti_authenticator['port # Extra customization # Settings['extra'] ||= Settingslogic.new({}) -Settings.extra['matomo_site_id'] ||= Settings.extra['piwik_site_id'] -Settings.extra['matomo_url'] ||= Settings.extra['piwik_url'] +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? # # Rack::Attack settings |