Commit Graph

14 Commits

Author SHA1 Message Date
GitLab Bot 98252e0dd6 Add latest changes from gitlab-org/gitlab@master 2020-01-20 12:09:02 +00:00
GitLab Bot aa0f0e9921 Add latest changes from gitlab-org/gitlab@master 2020-01-16 18:08:46 +00:00
GitLab Bot 0ba3a054d2 Add latest changes from gitlab-org/gitlab@master 2020-01-10 09:07:49 +00:00
GitLab Bot a7df1d8717 Add latest changes from gitlab-org/gitlab@master 2020-01-08 15:08:01 +00:00
GitLab Bot 4247e67be1 Add latest changes from gitlab-org/gitlab@master 2020-01-03 12:07:59 +00:00
GitLab Bot b085478c4c Add latest changes from gitlab-org/gitlab@master 2020-01-01 06:09:01 +00:00
GitLab Bot 93c6764dac Add latest changes from gitlab-org/gitlab@master 2019-12-09 12:07:58 +00:00
GitLab Bot 8723197387 Add latest changes from gitlab-org/gitlab@master 2019-12-05 12:07:43 +00:00
GitLab Bot d2ffc30fd5 Add latest changes from gitlab-org/gitlab@master 2019-10-16 12:06:32 +00:00
GitLab Bot 5ff1b520ba Add latest changes from gitlab-org/gitlab@master 2019-10-14 09:07:54 +00:00
Illya Klymov 6bbba7017b Refactored Karma spec to Jest for mr_widget_auto_merge_failed 2019-08-27 18:50:22 +03: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