Commit graph

8 commits

Author SHA1 Message Date
Oswaldo Ferreira
3063225ca2 Display merge commit SHA in merge widget after merge 2018-05-07 14:09:47 -03: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
Fatih Acet
059ab73b8e Render MR Notes with Vue with behind a cookie 2018-02-28 00:10:43 +00:00
Yorick Peterse
d0b8f536a1
Remove soft removals related code
This removes all usage of soft removals except for the "pending delete"
system implemented for projects. This in turn simplifies all the query
plans of the models that used soft removals. Since we don't really use
soft removals for anything useful there's no point in keeping it around.

This _does_ mean that hard removals of issues (which only admins can do
if I'm not mistaken) can influence the "iid" values, but that code is
broken to begin with. More on this (and how to fix it) can be found in
https://gitlab.com/gitlab-org/gitlab-ce/issues/31114.

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/37447
2018-01-08 17:04:45 +01: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
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/fixtures/api/schemas/entities/merge_request.json (Browse further)