Merge branch 'master' into 'backstage/gb/use-persisted-stages-to-improve-pipelines-table'

# Conflicts:
#   db/schema.rb

5 files changed, 48 insertions, 13 deletions

diff --git a/db/migrate/20160226114608_add_trigram_indexes_for_searching.rb b/db/migrate/20160226114608_add_trigram_indexes_for_searching.rb
index 375e389e07a..7aa79bf5e02 100644
--- a/db/migrate/20160226114608_add_trigram_indexes_for_searching.rb
+++ b/db/migrate/20160226114608_add_trigram_indexes_for_searching.rb
@@ -37,7 +37,12 @@ class AddTrigramIndexesForSearching < ActiveRecord::Migration
     res = execute("SELECT true AS enabled FROM pg_available_extensions WHERE name = 'pg_trgm' AND installed_version IS NOT NULL;")
     row = res.first
 
-    row && row['enabled'] == 't' ? true : false
+    check = if Gitlab.rails5?
+              true
+            else
+              't'
+            end
+    row && row['enabled'] == check ? true : false
   end
 
   def create_trigrams_extension
diff --git a/db/migrate/20170622135728_add_unique_constraint_to_ci_variables.rb b/db/migrate/20170622135728_add_unique_constraint_to_ci_variables.rb
index 8b2cc40ee59..787022b7bfe 100644
--- a/db/migrate/20170622135728_add_unique_constraint_to_ci_variables.rb
+++ b/db/migrate/20170622135728_add_unique_constraint_to_ci_variables.rb
@@ -2,12 +2,13 @@ class AddUniqueConstraintToCiVariables < ActiveRecord::Migration
   include Gitlab::Database::MigrationHelpers
 
   DOWNTIME = false
+  INDEX_NAME = 'index_ci_variables_on_project_id_and_key_and_environment_scope'
 
   disable_ddl_transaction!
 
   def up
     unless this_index_exists?
-      add_concurrent_index(:ci_variables, columns, name: index_name, unique: true)
+      add_concurrent_index(:ci_variables, columns, name: INDEX_NAME, unique: true)
     end
   end
 
@@ -18,21 +19,17 @@ class AddUniqueConstraintToCiVariables < ActiveRecord::Migration
         add_concurrent_index(:ci_variables, :project_id)
       end
 
-      remove_concurrent_index(:ci_variables, columns, name: index_name)
+      remove_concurrent_index(:ci_variables, columns, name: INDEX_NAME)
     end
   end
 
   private
 
   def this_index_exists?
-    index_exists?(:ci_variables, columns, name: index_name)
+    index_exists?(:ci_variables, columns, name: INDEX_NAME)
   end
 
   def columns
     @columns ||= [:project_id, :key, :environment_scope]
   end
-
-  def index_name
-    'index_ci_variables_on_project_id_and_key_and_environment_scope'
-  end
 end
diff --git a/db/migrate/20171106155656_turn_issues_due_date_index_to_partial_index.rb b/db/migrate/20171106155656_turn_issues_due_date_index_to_partial_index.rb
index e4bed778695..08784de4043 100644
--- a/db/migrate/20171106155656_turn_issues_due_date_index_to_partial_index.rb
+++ b/db/migrate/20171106155656_turn_issues_due_date_index_to_partial_index.rb
@@ -20,9 +20,7 @@ class TurnIssuesDueDateIndexToPartialIndex < ActiveRecord::Migration
       name: NEW_INDEX_NAME
     )
 
-    # We set the column name to nil as otherwise Rails will ignore the custom
-    # index name and remove the wrong index.
-    remove_concurrent_index(:issues, nil, name: OLD_INDEX_NAME)
+    remove_concurrent_index_by_name(:issues, OLD_INDEX_NAME)
   end
 
   def down
@@ -32,6 +30,6 @@ class TurnIssuesDueDateIndexToPartialIndex < ActiveRecord::Migration
       name: OLD_INDEX_NAME
     )
 
-    remove_concurrent_index(:issues, nil, name: NEW_INDEX_NAME)
+    remove_concurrent_index_by_name(:issues, NEW_INDEX_NAME)
   end
 end
diff --git a/db/migrate/20180201110056_add_foreign_keys_to_todos.rb b/db/migrate/20180201110056_add_foreign_keys_to_todos.rb
index b7c40f8c01a..020b0550321 100644
--- a/db/migrate/20180201110056_add_foreign_keys_to_todos.rb
+++ b/db/migrate/20180201110056_add_foreign_keys_to_todos.rb
@@ -31,7 +31,7 @@ class AddForeignKeysToTodos < ActiveRecord::Migration
   end
 
   def down
-    remove_foreign_key :todos, :users
+    remove_foreign_key :todos, column: :user_id
     remove_foreign_key :todos, column: :author_id
     remove_foreign_key :todos, :notes
   end
diff --git a/db/post_migrate/20180529152628_schedule_to_archive_legacy_traces.rb b/db/post_migrate/20180529152628_schedule_to_archive_legacy_traces.rb
new file mode 100644
index 00000000000..965cd3a8714
--- /dev/null
+++ b/db/post_migrate/20180529152628_schedule_to_archive_legacy_traces.rb
@@ -0,0 +1,35 @@
+class ScheduleToArchiveLegacyTraces < ActiveRecord::Migration
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+  BATCH_SIZE = 5000
+  BACKGROUND_MIGRATION_CLASS = 'ArchiveLegacyTraces'
+
+  disable_ddl_transaction!
+
+  class Build < ActiveRecord::Base
+    include EachBatch
+    self.table_name = 'ci_builds'
+    self.inheritance_column = :_type_disabled # Disable STI
+
+    scope :type_build, -> { where(type: 'Ci::Build') }
+
+    scope :finished, -> { where(status: [:success, :failed, :canceled]) }
+
+    scope :without_archived_trace, -> do
+      where('NOT EXISTS (SELECT 1 FROM ci_job_artifacts WHERE ci_builds.id = ci_job_artifacts.job_id AND ci_job_artifacts.file_type = 3)')
+    end
+  end
+
+  def up
+    queue_background_migration_jobs_by_range_at_intervals(
+      ::ScheduleToArchiveLegacyTraces::Build.type_build.finished.without_archived_trace,
+      BACKGROUND_MIGRATION_CLASS,
+      5.minutes,
+      batch_size: BATCH_SIZE)
+  end
+
+  def down
+    # noop
+  end
+end