Commit Graph

20 Commits

Author SHA1 Message Date
GitLab Bot 6d05fbc478 Add latest changes from gitlab-org/gitlab@master 2022-04-04 18:08:38 +00:00
GitLab Bot 4dc620034e Add latest changes from gitlab-org/gitlab@master 2022-01-13 00:16:12 +00:00
GitLab Bot 5838993b5f Add latest changes from gitlab-org/gitlab@master 2020-12-23 21:10:24 +00:00
GitLab Bot c6283014fe Add latest changes from gitlab-org/gitlab@master 2020-09-17 12:09:37 +00:00
GitLab Bot 6110935892 Add latest changes from gitlab-org/gitlab@master 2020-07-17 06:09:11 +00:00
GitLab Bot 7c38405be9 Add latest changes from gitlab-org/gitlab@master 2020-03-10 15:08:08 +00:00
GitLab Bot 6a7cc8c147 Add latest changes from gitlab-org/gitlab@master 2019-12-05 18:07:51 +00:00
GitLab Bot 80f61b4035 Add latest changes from gitlab-org/gitlab@master 2019-09-18 14:02:45 +00:00
Igor b99011af62 Split MR widget into cached and non-cached serializers
Splits auto-refreshing of MR widget into 2 requests:

- the one which uses etag-caching and invalidates the fields on change
- the one without caching

The idea is to gradually move all the fields to etag-cached endpoint
2019-08-09 21:01:55 +00:00
Igor Drozdov 07559fda51 Extract MR's widget into a separate endpoint
This commits extracts /merge_requests/1.json?serializer=widget
Into a separate /merge_requests/1/widget.json endpoint
This will allow to use caching for this request
2019-06-28 10:52:48 +03:00
Winnie Hellmann 71cc198fc7 Delete ee_switch files from merge request widget
(cherry picked from commit 9c64af3c2821d4f63e4a48903f4d3099bb85cebd)
2019-01-30 14:43:56 +01:00
Mike Greiling 160157a92b
Prettify remaining files with differences in CE and EE 2018-10-31 14:33:12 -05:00
Alessio Caiazza dadc046d3a post merge pipeline and environments status 2018-10-29 11:34:41 +00:00
Winnie Hellmann aaa6cab05a Resolve circular dependencies in merge request widget 2018-10-25 17:54:04 +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
Eric Eastwood 254c0754eb Switch vue_merge_request_widget to Axios 2018-01-02 18:00:04 -06: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
Eric Eastwood 6dc9028fbb Load participants async 2017-10-31 16:15:03 +00:00
Oswaldo Ferreira e8841e8dbc Drop merge_check endpoint and use only MR show instead 2017-05-18 19:23:05 -03:00
Fatih Acet 0151325dac Merge request widget redesign 2017-05-09 04:15:34 +00:00