Commit Graph

13 Commits

Author SHA1 Message Date
GitLab Bot 64f7eb2b37 Add latest changes from gitlab-org/gitlab@master 2021-02-05 12:09:31 +00:00
GitLab Bot a27b8a5c10 Add latest changes from gitlab-org/gitlab@master 2020-10-01 12:10:14 +00:00
GitLab Bot a865379008 Add latest changes from gitlab-org/gitlab@master 2020-09-07 12:08:27 +00:00
GitLab Bot 09093c1278 Add latest changes from gitlab-org/gitlab@master 2020-04-15 18:09:36 +00:00
Oswaldo Ferreira ca884980ee [CE] Support multiple assignees for merge requests
Backports https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10161
(code out of ee/ folder).
2019-04-08 18:40:00 -03:00
Fatih Acet 56506ff82f
Send lockVersion from MR description task list 2019-01-30 23:18:18 +01:00
Heinrich Lee Yu 6c79e9307e Refactor issuable sidebar to have extras option 2018-12-19 17:58:53 +08:00
gfyoung dce26700b2 Enable frozen string in app/serializers/**/*.rb
Partially addresses #47424.
2018-07-23 11:27:39 -07:00
Mario de la Ossa c6420ce2ab
Fix milestones disappearing when changed on MR 2018-06-15 17:46:49 -06: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 6dc9028fbb Load participants async 2017-10-31 16:15:03 +00:00
Oswaldo Ferreira a355bcac4b Stop loading MergeRequestEntity data on sidebar request 2017-05-18 20:41:31 -03:00
Fatih Acet 0151325dac Merge request widget redesign 2017-05-09 04:15:34 +00:00