delta/gitlab/gitlab-ce.git/app/workers/rebase_worker.rb, branch scripts-differences

Allow asynchronous rebase operations to be monitored

2019-07-04T07:50:55+00:00

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.

Enable frozen string literals for app/workers/*.rb

2018-06-27T07:23:28+00:00

Backport 'Rebase' feature from EE to CE

2018-01-05T08:34:59+00:00

When a project uses fast-forward merging strategy user has
to rebase MRs to target branch before it can be merged.
Now user can do rebase in UI by clicking 'Rebase' button
instead of doing rebase locally.

This feature was already present in EE, this is only backport
of the feature to CE. Couple of changes:
* removed rebase license check
* renamed migration (changed timestamp)

Closes #40301