Merge branch 'add-target-project-and-branch-to-merge-trains-ee' into 'master'

Persist target project id and target branch in merge trains table

See merge request gitlab-org/gitlab-ee!14060

db/migrate/20190611161641_add_target_project_id_to_merge_trains.rb

+# frozen_string_literal: true
+
+class AddTargetProjectIdToMergeTrains < ActiveRecord::Migration[5.1]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def change
+    # rubocop: disable Rails/NotNullColumn
+    add_reference :merge_trains, :target_project, null: false, index: true, foreign_key: { on_delete: :cascade, to_table: :projects }, type: :integer
+    add_column :merge_trains, :target_branch, :text, null: false
+    # rubocop: enable Rails/NotNullColumn
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20190603124955) do
+ActiveRecord::Schema.define(version: 20190611161641) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -1978,8 +1978,11 @@ ActiveRecord::Schema.define(version: 20190603124955) do
     t.integer "pipeline_id"
     t.datetime_with_timezone "created_at", null: false
     t.datetime_with_timezone "updated_at", null: false
+    t.integer "target_project_id", null: false
+    t.text "target_branch", null: false
     t.index ["merge_request_id"], name: "index_merge_trains_on_merge_request_id", unique: true, using: :btree
     t.index ["pipeline_id"], name: "index_merge_trains_on_pipeline_id", using: :btree
+    t.index ["target_project_id"], name: "index_merge_trains_on_target_project_id", using: :btree
     t.index ["user_id"], name: "index_merge_trains_on_user_id", using: :btree
   end
 
@@ -3697,6 +3700,7 @@ ActiveRecord::Schema.define(version: 20190603124955) do
   add_foreign_key "merge_requests_closing_issues", "merge_requests", on_delete: :cascade
   add_foreign_key "merge_trains", "ci_pipelines", column: "pipeline_id", on_delete: :nullify
   add_foreign_key "merge_trains", "merge_requests", on_delete: :cascade
+  add_foreign_key "merge_trains", "projects", column: "target_project_id", on_delete: :cascade
   add_foreign_key "merge_trains", "users", on_delete: :cascade
   add_foreign_key "milestones", "namespaces", column: "group_id", name: "fk_95650a40d4", on_delete: :cascade
   add_foreign_key "milestones", "projects", name: "fk_9bd0a0c791", on_delete: :cascade

ee/app/models/ee/merge_request.rb

@@ -79,7 +79,7 @@ module EE
     end
 
     def get_on_train!(user)
-      create_merge_train!(user: user)
+      create_merge_train!(user: user, target_project: target_project, target_branch: target_branch)
     end
 
     def get_off_train!

ee/app/models/ee/project.rb

@@ -62,7 +62,7 @@ module EE
       accepts_nested_attributes_for :software_license_policies, allow_destroy: true
       has_many :packages, class_name: 'Packages::Package'
       has_many :package_files, through: :packages, class_name: 'Packages::PackageFile'
-      has_many :merge_trains
+      has_many :merge_trains, foreign_key: 'target_project_id', inverse_of: :target_project
 
       has_many :sourced_pipelines, class_name: 'Ci::Sources::Pipeline', foreign_key: :source_project_id
 

ee/app/models/merge_train.rb

 # frozen_string_literal: true
 
 class MergeTrain < ApplicationRecord
+  belongs_to :target_project, class_name: "Project"
   belongs_to :merge_request
   belongs_to :user
   belongs_to :pipeline, class_name: 'Ci::Pipeline'

ee/spec/factories/merge_trains.rb

@@ -2,6 +2,8 @@
 
 FactoryBot.define do
   factory :merge_train do
+    target_branch 'master'
+    target_project factory: :project
     merge_request
     user
     pipeline factory: :ci_pipeline