Commit graph

12 commits

Author SHA1 Message Date
blackst0ne
4cff66a6c4 Add 'squash and rebase' feature to CE 2018-05-29 20:51:43 +11:00
Oswaldo Ferreira
3063225ca2 Display merge commit SHA in merge widget after merge 2018-05-07 14:09:47 -03:00
Bob Van Landuyt
558e9cd92b Link correct project when adding file to empty MR
When creating a cross project merge request without changes. The MR
widget shows the option to create a new file. It would however link to
the wrong project.
2018-03-07 17:00:44 +01:00
Bob Van Landuyt
e74879280f Allow maintainers to edit directly in a fork 2018-03-07 16:55:34 +01:00
Bob Van Landuyt
792ab0631c Allow a user to select allow maintainer to push
When a project is not private, and the source branch not protected the
user can now select the option to allow maintainers to push to this
branch
2018-03-07 15:12:31 +01:00
Alejandro Rodríguez
c277aac9dc Don't do a commit lookup to present the MR entity, just return the sha
The MergeRequestWidgetEntity is used a lot in AJAX requests, and shaving
that git operation will hopefully translate in a performance improvement
2018-03-06 22:49:50 -03:00
Fatih Acet
059ab73b8e Render MR Notes with Vue with behind a cookie 2018-02-28 00:10:43 +00:00
Oswaldo Ferreira
dbfedb5adb Check MR state before submitting queries for discussion state 2018-01-29 23:53:47 -02: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
Oswaldo Ferreira
87a437995e Simplify metrics fetching for closed/merged MRs 2018-01-03 11:57:07 -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 app/serializers/merge_request_entity.rb (Browse further)