diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-06 18:08:20 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-06 18:08:20 +0300 |
| commit | 78782cd1eb5273265668ca3e438bb8cbb1344004 (patch) | |
| tree | 63e9715611d41a0c9dac52aca6613c1fc2af7b58 /config | |
| parent | b161512b300e70c1e786dd299867dad284e11019 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/feature_flags/development/ci_remove_legacy_predefined_variables.yml (renamed from config/feature_flags/development/async_commit_diff_files.yml) | 10 | ||||
| -rw-r--r-- | config/initializers/active_record_migrations.rb | 1 |
2 files changed, 6 insertions, 5 deletions
diff --git a/config/feature_flags/development/async_commit_diff_files.yml b/config/feature_flags/development/ci_remove_legacy_predefined_variables.yml index 0cadf592cc1..dd54b9d6d2a 100644 --- a/config/feature_flags/development/async_commit_diff_files.yml +++ b/config/feature_flags/development/ci_remove_legacy_predefined_variables.yml @@ -1,8 +1,8 @@ --- -name: async_commit_diff_files -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/38450 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/369439 -milestone: '13.3' +name: ci_remove_legacy_predefined_variables +introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/116606 +rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/404533 +milestone: '15.11' type: development -group: group::source code +group: group::pipeline authoring default_enabled: false diff --git a/config/initializers/active_record_migrations.rb b/config/initializers/active_record_migrations.rb index d878a1b210b..b83b394d8d3 100644 --- a/config/initializers/active_record_migrations.rb +++ b/config/initializers/active_record_migrations.rb @@ -1,3 +1,4 @@ # frozen_string_literal: true Gitlab::Database::Migrations::LockRetryMixin.patch! +Gitlab::Database::Migrations::PgBackendPid.patch! |