diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-10 18:08:08 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-10 18:08:08 +0300 |
commit | 7c38405be9e79099f399aa429503ea7b463bbf5a (patch) | |
tree | 30944a8baf135021395574e081f53ed5f756ace0 /db | |
parent | 1fa79760ad2d4bd67f5c5a27f372a7533b9b7c69 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20200305121159_add_merge_request_metrics_first_reassigned_at.rb | 19 | ||||
-rw-r--r-- | db/migrate/20200306095654_add_merge_request_assignee_created_at.rb | 19 | ||||
-rw-r--r-- | db/schema.rb | 2 |
3 files changed, 40 insertions, 0 deletions
diff --git a/db/migrate/20200305121159_add_merge_request_metrics_first_reassigned_at.rb b/db/migrate/20200305121159_add_merge_request_metrics_first_reassigned_at.rb new file mode 100644 index 00000000000..714adf925ed --- /dev/null +++ b/db/migrate/20200305121159_add_merge_request_metrics_first_reassigned_at.rb @@ -0,0 +1,19 @@ +# frozen_string_literal: true + +class AddMergeRequestMetricsFirstReassignedAt < ActiveRecord::Migration[6.0] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + def up + with_lock_retries do + add_column :merge_request_metrics, :first_reassigned_at, :datetime_with_timezone + end + end + + def down + with_lock_retries do + remove_column :merge_request_metrics, :first_reassigned_at, :datetime_with_timezone + end + end +end diff --git a/db/migrate/20200306095654_add_merge_request_assignee_created_at.rb b/db/migrate/20200306095654_add_merge_request_assignee_created_at.rb new file mode 100644 index 00000000000..127a20f127b --- /dev/null +++ b/db/migrate/20200306095654_add_merge_request_assignee_created_at.rb @@ -0,0 +1,19 @@ +# frozen_string_literal: true + +class AddMergeRequestAssigneeCreatedAt < ActiveRecord::Migration[6.0] + include Gitlab::Database::MigrationHelpers + + DOWNTIME = false + + def up + with_lock_retries do + add_column :merge_request_assignees, :created_at, :datetime_with_timezone + end + end + + def down + with_lock_retries do + remove_column :merge_request_assignees, :created_at + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 32cc771c396..40cf50354db 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -2450,6 +2450,7 @@ ActiveRecord::Schema.define(version: 2020_03_06_170531) do create_table "merge_request_assignees", force: :cascade do |t| t.integer "user_id", null: false t.integer "merge_request_id", null: false + t.datetime_with_timezone "created_at" t.index ["merge_request_id", "user_id"], name: "index_merge_request_assignees_on_merge_request_id_and_user_id", unique: true t.index ["merge_request_id"], name: "index_merge_request_assignees_on_merge_request_id" t.index ["user_id"], name: "index_merge_request_assignees_on_user_id" @@ -2564,6 +2565,7 @@ ActiveRecord::Schema.define(version: 2020_03_06_170531) do t.integer "modified_paths_size" t.integer "commits_count" t.datetime_with_timezone "first_approved_at" + t.datetime_with_timezone "first_reassigned_at" t.index ["first_deployed_to_production_at"], name: "index_merge_request_metrics_on_first_deployed_to_production_at" t.index ["latest_closed_at"], name: "index_merge_request_metrics_on_latest_closed_at", where: "(latest_closed_at IS NOT NULL)" t.index ["latest_closed_by_id"], name: "index_merge_request_metrics_on_latest_closed_by_id" |