diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-07 21:09:53 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-07 21:09:53 +0300 |
| commit | 5edd0d173ff0bc377348bf3585fa309eee783e32 (patch) | |
| tree | d71d995f018e56453e438f7b670c6597e45b4dd6 /config | |
| parent | 61d62a296064e0330cffec7ed4b7914371b4984b (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/database_geo.yml.postgresql | 4 | ||||
| -rw-r--r-- | config/feature_flags/development/async_update_pages_config.yml | 7 | ||||
| -rw-r--r-- | config/sidekiq_queues.yml | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/config/database_geo.yml.postgresql b/config/database_geo.yml.postgresql index d863be026a5..25b9c6d5eb1 100644 --- a/config/database_geo.yml.postgresql +++ b/config/database_geo.yml.postgresql @@ -8,7 +8,6 @@ production: username: git password: "secure password" host: localhost - fdw: true # # Development specific @@ -20,7 +19,6 @@ development: username: postgres password: "secure password" host: localhost - fdw: true # # Staging specific @@ -32,7 +30,6 @@ staging: username: git password: "secure password" host: localhost - fdw: true # Warning: The database defined as "test" will be erased and # re-generated from your development database when you run "rake". @@ -44,4 +41,3 @@ test: &test username: postgres password: host: localhost - fdw: true diff --git a/config/feature_flags/development/async_update_pages_config.yml b/config/feature_flags/development/async_update_pages_config.yml new file mode 100644 index 00000000000..4408197f287 --- /dev/null +++ b/config/feature_flags/development/async_update_pages_config.yml @@ -0,0 +1,7 @@ +--- +name: async_update_pages_config +introduced_by_url: +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/230695 +group: 'team::Scalability' +type: development +default_enabled: false diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml index a4d25ce1578..cda830de8f6 100644 --- a/config/sidekiq_queues.yml +++ b/config/sidekiq_queues.yml @@ -178,6 +178,8 @@ - 1 - - pages_domain_verification - 1 +- - pages_update_configuration + - 1 - - personal_access_tokens - 1 - - phabricator_import_import_tasks |