Commit Graph

11 Commits

Author SHA1 Message Date
GitLab Bot f5dcc7ae73 Add latest changes from gitlab-org/gitlab@master 2020-10-12 21:08:56 +00:00
GitLab Bot 7dc8bd3c16 Add latest changes from gitlab-org/gitlab@master 2020-09-15 21:09:35 +00:00
GitLab Bot a865379008 Add latest changes from gitlab-org/gitlab@master 2020-09-07 12:08:27 +00:00
GitLab Bot 85f7fa54f4 Add latest changes from gitlab-org/gitlab@master 2020-08-18 18:10:10 +00:00
GitLab Bot 4bc0e06402 Add latest changes from gitlab-org/gitlab@master 2020-07-17 03:09:14 +00:00
GitLab Bot 143f7be045 Add latest changes from gitlab-org/gitlab@master 2020-05-12 06:09:37 +00:00
GitLab Bot 5c8c561ac6 Add latest changes from gitlab-org/gitlab@master 2020-04-24 12:10:16 +00:00
GitLab Bot 5ff1b520ba Add latest changes from gitlab-org/gitlab@master 2019-10-14 09:07:54 +00:00
Nathan Friend 84e550fad9 Fix frontend tests related to autoMergeStrategy
A few minor frontend changes to complete the refactoring
from MWPS to the more generic autoMergeStrategy.
2019-06-03 13:15:31 +07:00
Shinya Maeda d4b4693663 Abstract auto merge processes
We have one auto merge strategy today - Merge When Pipeline
Succeeds.

In order to add more strategies for Merge Train feature,
we abstract the architecture to be more extensible.

Removed arguments

Fix spec
2019-06-03 13:15:29 +07:00
Winnie Hellmann 514ee63826 Move some tests from Karma to Jest 2019-03-23 17:53:46 +01:00