diff options
author | Nick Thomas <nick@gitlab.com> | 2019-06-21 17:56:47 +0100 |
---|---|---|
committer | Nick Thomas <nick@gitlab.com> | 2019-07-04 08:50:55 +0100 |
commit | 381468d0cc6e5b528a4b2207c0a534569035a73f (patch) | |
tree | 2ffc9e9062fef50a7cca8dfd8d0b5733e8cf4c9d /db | |
parent | 9ef0c8559de925d0a72a3fe421d95209c2b81d8f (diff) | |
download | gitlab-ce-381468d0cc6e5b528a4b2207c0a534569035a73f.tar.gz |
Allow asynchronous rebase operations to be monitored
This MR introduces tracking of the `rebase_jid` for merge requests. As
with `merge_ongoing?`, `rebase_in_progress?` will now return true if a
rebase is proceeding in sidekiq.
After one release, we should remove the Gitaly-based lookup of rebases.
It is much better to track this kind of thing via the database.
Diffstat (limited to 'db')
-rw-r--r-- | db/migrate/20190621151636_add_merge_request_rebase_jid.rb | 9 | ||||
-rw-r--r-- | db/schema.rb | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/db/migrate/20190621151636_add_merge_request_rebase_jid.rb b/db/migrate/20190621151636_add_merge_request_rebase_jid.rb new file mode 100644 index 00000000000..1fed5690ead --- /dev/null +++ b/db/migrate/20190621151636_add_merge_request_rebase_jid.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +class AddMergeRequestRebaseJid < ActiveRecord::Migration[5.1] + DOWNTIME = false + + def change + add_column :merge_requests, :rebase_jid, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index 4bcc8b5f1d7..9cc45bb1e47 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1989,6 +1989,7 @@ ActiveRecord::Schema.define(version: 20190628185004) do t.boolean "allow_maintainer_to_push" t.integer "state_id", limit: 2 t.integer "approvals_before_merge" + t.string "rebase_jid" t.index ["assignee_id"], name: "index_merge_requests_on_assignee_id", using: :btree t.index ["author_id"], name: "index_merge_requests_on_author_id", using: :btree t.index ["created_at"], name: "index_merge_requests_on_created_at", using: :btree |