Add latest changes from gitlab-org/gitlab@master

2 files changed, 23 insertions, 0 deletions

diff --git a/db/migrate/20200311141943_insert_ci_pipeline_schedules_plan_limits.rb b/db/migrate/20200311141943_insert_ci_pipeline_schedules_plan_limits.rb
index d1ad5be5f85..849d95667a7 100644
--- a/db/migrate/20200311141943_insert_ci_pipeline_schedules_plan_limits.rb
+++ b/db/migrate/20200311141943_insert_ci_pipeline_schedules_plan_limits.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class InsertCiPipelineSchedulesPlanLimits < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
   DOWNTIME = false
 
   def change
diff --git a/db/migrate/20200312160532_add_index_on_mirror_and_id_to_projects.rb b/db/migrate/20200312160532_add_index_on_mirror_and_id_to_projects.rb
new file mode 100644
index 00000000000..3a64b915931
--- /dev/null
+++ b/db/migrate/20200312160532_add_index_on_mirror_and_id_to_projects.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class AddIndexOnMirrorAndIdToProjects < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+  OLD_INDEX_NAME = 'index_projects_on_mirror_and_mirror_trigger_builds_both_true'
+  NEW_INDEX_NAME = 'index_projects_on_mirror_id_where_mirror_and_trigger_builds'
+
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_index :projects, :id, where: 'mirror = TRUE AND mirror_trigger_builds = TRUE', name: NEW_INDEX_NAME
+    remove_concurrent_index_by_name :projects, OLD_INDEX_NAME
+  end
+
+  def down
+    add_concurrent_index :projects, :id, where: 'mirror IS TRUE AND mirror_trigger_builds IS TRUE', name: OLD_INDEX_NAME
+    remove_concurrent_index_by_name :projects, NEW_INDEX_NAME
+  end
+end