diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-15 18:49:40 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-15 18:49:40 +0300 |
| commit | b04b1e12c5847f7d366e08af47115d985b73e185 (patch) | |
| tree | 5077e33eedbf1e99b9ef9b87395f9acce844b234 /db/migrate | |
| parent | a5b9fb9abc2b83304f45392642801b28f52b3f48 (diff) | |
Add latest changes from gitlab-org/gitlab@12-10-stable-ee
Diffstat (limited to 'db/migrate')
| -rw-r--r-- | db/migrate/20191229140154_drop_index_ci_pipelines_on_project_id.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/db/migrate/20191229140154_drop_index_ci_pipelines_on_project_id.rb b/db/migrate/20191229140154_drop_index_ci_pipelines_on_project_id.rb index dbfe3758cda..9e78457b007 100644 --- a/db/migrate/20191229140154_drop_index_ci_pipelines_on_project_id.rb +++ b/db/migrate/20191229140154_drop_index_ci_pipelines_on_project_id.rb @@ -8,10 +8,13 @@ class DropIndexCiPipelinesOnProjectId < ActiveRecord::Migration[5.2] disable_ddl_transaction! def up - remove_concurrent_index :ci_pipelines, :project_id + remove_concurrent_index_by_name :ci_pipelines, 'index_ci_pipelines_on_project_id' + + # extra (duplicate) index that already existed on some installs + remove_concurrent_index_by_name :ci_pipelines, 'ci_pipelines_project_id_idx' end def down - add_concurrent_index :ci_pipelines, :project_id + add_concurrent_index :ci_pipelines, :project_id, name: 'index_ci_pipelines_on_project_id' end end |