diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-05 18:09:46 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-05 18:09:46 +0300 |
| commit | 01034c2c457bad1933e954ba01e5f21cdf546168 (patch) | |
| tree | 26770a101ba1afad20aa10cbd1a0e52c0e88a05a /config | |
| parent | 5147cd60f141434f82ce95cc9039afddf415f02b (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/feature_flags/development/paginated_tree_graphql_query.yml | 8 | ||||
| -rw-r--r-- | config/initializers/check_decomposition_database_config.rb | 7 |
2 files changed, 8 insertions, 7 deletions
diff --git a/config/feature_flags/development/paginated_tree_graphql_query.yml b/config/feature_flags/development/paginated_tree_graphql_query.yml new file mode 100644 index 00000000000..13096412f25 --- /dev/null +++ b/config/feature_flags/development/paginated_tree_graphql_query.yml @@ -0,0 +1,8 @@ +--- +name: paginated_tree_graphql_query +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66751 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/337214 +milestone: '14.2' +type: development +group: group::source code +default_enabled: false diff --git a/config/initializers/check_decomposition_database_config.rb b/config/initializers/check_decomposition_database_config.rb deleted file mode 100644 index f32c72efa75..00000000000 --- a/config/initializers/check_decomposition_database_config.rb +++ /dev/null @@ -1,7 +0,0 @@ -# frozen_string_literal: true - -ci_db_config = Gitlab::Application.config.database_configuration[Rails.env]["ci"] - -if ci_db_config.present? - raise "migrations_paths setting for ci database must be `db/ci_migrate`" unless ci_db_config["migrations_paths"] == 'db/ci_migrate' -end |