4 commits

Author	SHA1	Message	Date
GitLab Bot	25989ab7ef	Add latest changes from gitlab-org/gitlab@master	2019-10-18 11:11:44 +00:00
Nick Thomas	381468d0cc	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.	2019-07-04 08:50:55 +01:00
gfyoung	dfbe5ce435	Enable frozen string literals for app/workers/*.rb	2018-06-27 07:23:28 +00:00
Jan Provaznik	27a75ea175	Backport 'Rebase' feature from EE to CE ... 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	2018-01-05 09:34:59 +01:00