diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-27 00:09:22 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-27 00:09:22 +0300 |
| commit | 8e28b42532fa7c0c6f33113187d7378a1e48a1c6 (patch) | |
| tree | f6a10ef1d6d4de53e9b3e261608e931942a02af1 /config | |
| parent | 08931747cc2092734a794980ef13ff67e89a9d8b (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/feature_flags/development/datadog_ci_integration.yml | 7 | ||||
| -rw-r--r-- | config/initializers/structure_load_in_transaction.rb | 9 |
2 files changed, 16 insertions, 0 deletions
diff --git a/config/feature_flags/development/datadog_ci_integration.yml b/config/feature_flags/development/datadog_ci_integration.yml new file mode 100644 index 00000000000..c53ef36f3c1 --- /dev/null +++ b/config/feature_flags/development/datadog_ci_integration.yml @@ -0,0 +1,7 @@ +--- +name: datadog_ci_integration +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46564 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/284088 +type: development +group: group::ecosystem +default_enabled: false diff --git a/config/initializers/structure_load_in_transaction.rb b/config/initializers/structure_load_in_transaction.rb new file mode 100644 index 00000000000..7b8f0e07203 --- /dev/null +++ b/config/initializers/structure_load_in_transaction.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +ActiveRecord::Tasks::DatabaseTasks.structure_load_flags ||= [] + +flag = '--single-transaction' + +unless ActiveRecord::Tasks::DatabaseTasks.structure_load_flags.include?(flag) + ActiveRecord::Tasks::DatabaseTasks.structure_load_flags << flag +end |