diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-06-21 19:56:47 +0300 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-07-04 10:50:55 +0300 |
| commit | 381468d0cc6e5b528a4b2207c0a534569035a73f (patch) | |
| tree | 2ffc9e9062fef50a7cca8dfd8d0b5733e8cf4c9d /changelogs | |
| parent | 9ef0c8559de925d0a72a3fe421d95209c2b81d8f (diff) | |
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 'changelogs')
| -rw-r--r-- | changelogs/unreleased/54117-transactional-rebase.yml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/changelogs/unreleased/54117-transactional-rebase.yml b/changelogs/unreleased/54117-transactional-rebase.yml new file mode 100644 index 00000000000..d0c93114c49 --- /dev/null +++ b/changelogs/unreleased/54117-transactional-rebase.yml @@ -0,0 +1,5 @@ +--- +title: Allow asynchronous rebase operations to be monitored +merge_request: 29940 +author: +type: fixed |