Commit graph

4 commits

Author SHA1 Message Date
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
Oswaldo Ferreira
feee48a4cf Fixes spec failures due to not returning metrics for MRs other than closed/merged 2018-01-02 19:27:00 -02:00
Oswaldo Ferreira
bf8c20729b Cache merged and closed events data in merge_request_metrics table 2018-01-02 17:45:25 -02:00
Oswaldo Ferreira
cba40a1f55 Stop sending milestone and labels data over the wire for MR widget
requests
2017-12-15 15:31:16 -02:00
Renamed from spec/serializers/merge_request_entity_spec.rb (Browse further)