Add latest changes from gitlab-org/gitlab@master

5 files changed, 69 insertions, 1 deletions

diff --git a/db/migrate/20190920122420_add_max_personal_access_token_lifetime_to_application_settings.rb b/db/migrate/20190920122420_add_max_personal_access_token_lifetime_to_application_settings.rb
new file mode 100644
index 00000000000..5a6e810dede
--- /dev/null
+++ b/db/migrate/20190920122420_add_max_personal_access_token_lifetime_to_application_settings.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class AddMaxPersonalAccessTokenLifetimeToApplicationSettings < ActiveRecord::Migration[5.2]
+  DOWNTIME = false
+
+  def change
+    add_column :application_settings, :max_personal_access_token_lifetime, :integer
+  end
+end
diff --git a/db/migrate/20191106144901_add_state_to_merge_trains.rb b/db/migrate/20191106144901_add_state_to_merge_trains.rb
new file mode 100644
index 00000000000..e2256705f53
--- /dev/null
+++ b/db/migrate/20191106144901_add_state_to_merge_trains.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class AddStateToMergeTrains < ActiveRecord::Migration[5.2]
+  include Gitlab::Database::MigrationHelpers
+
+  MERGE_TRAIN_STATUS_CREATED = 0 # Equivalent to MergeTrain.statuses[:created]
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    add_column_with_default :merge_trains, :status, :integer, limit: 2, default: MERGE_TRAIN_STATUS_CREATED
+  end
+
+  def down
+    remove_column :merge_trains, :status
+  end
+end
diff --git a/db/migrate/20191112105448_add_index_on_personal_access_tokens_user_id_and_expires_at.rb b/db/migrate/20191112105448_add_index_on_personal_access_tokens_user_id_and_expires_at.rb
new file mode 100644
index 00000000000..1c1dc31ff23
--- /dev/null
+++ b/db/migrate/20191112105448_add_index_on_personal_access_tokens_user_id_and_expires_at.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class AddIndexOnPersonalAccessTokensUserIdAndExpiresAt < ActiveRecord::Migration[5.2]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+  INDEX_NAME = 'index_pat_on_user_id_and_expires_at'
+
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_index :personal_access_tokens, [:user_id, :expires_at], name: INDEX_NAME, using: :btree
+  end
+
+  def down
+    remove_concurrent_index_by_name :personal_access_tokens, INDEX_NAME
+  end
+end
diff --git a/db/migrate/20191118155702_add_index_on_status_to_merge_trains.rb b/db/migrate/20191118155702_add_index_on_status_to_merge_trains.rb
new file mode 100644
index 00000000000..9b5238045f8
--- /dev/null
+++ b/db/migrate/20191118155702_add_index_on_status_to_merge_trains.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class AddIndexOnStatusToMergeTrains < ActiveRecord::Migration[5.2]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+  INDEX_NAME = 'index_for_status_per_branch_per_project'
+
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_index :merge_trains, [:target_project_id, :target_branch, :status], name: INDEX_NAME
+    remove_concurrent_index :merge_trains, :target_project_id
+  end
+
+  def down
+    add_concurrent_index :merge_trains, :target_project_id
+    remove_concurrent_index :merge_trains, [:target_project_id, :target_branch, :status], name: INDEX_NAME
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 621ae7f380e..d33060f0e37 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -325,6 +325,7 @@ ActiveRecord::Schema.define(version: 2019_12_02_031812) do
     t.string "encrypted_asset_proxy_secret_key_iv"
     t.string "static_objects_external_storage_url", limit: 255
     t.string "static_objects_external_storage_auth_token", limit: 255
+    t.integer "max_personal_access_token_lifetime"
     t.boolean "throttle_protected_paths_enabled", default: false, null: false
     t.integer "throttle_protected_paths_requests_per_period", default: 10, null: false
     t.integer "throttle_protected_paths_period_in_seconds", default: 60, null: false
@@ -2524,9 +2525,10 @@ ActiveRecord::Schema.define(version: 2019_12_02_031812) do
     t.datetime_with_timezone "updated_at", null: false
     t.integer "target_project_id", null: false
     t.text "target_branch", null: false
+    t.integer "status", limit: 2, default: 0, null: false
     t.index ["merge_request_id"], name: "index_merge_trains_on_merge_request_id", unique: true
     t.index ["pipeline_id"], name: "index_merge_trains_on_pipeline_id"
-    t.index ["target_project_id"], name: "index_merge_trains_on_target_project_id"
+    t.index ["target_project_id", "target_branch", "status"], name: "index_for_status_per_branch_per_project"
     t.index ["user_id"], name: "index_merge_trains_on_user_id"
   end
 
@@ -2925,6 +2927,7 @@ ActiveRecord::Schema.define(version: 2019_12_02_031812) do
     t.boolean "impersonation", default: false, null: false
     t.string "token_digest"
     t.index ["token_digest"], name: "index_personal_access_tokens_on_token_digest", unique: true
+    t.index ["user_id", "expires_at"], name: "index_pat_on_user_id_and_expires_at"
     t.index ["user_id"], name: "index_personal_access_tokens_on_user_id"
   end