Commit Graph

199 Commits

Author SHA1 Message Date
GitLab Bot 0851c83c27 Add latest changes from gitlab-org/gitlab@master 2020-08-03 18:10:05 +00:00
GitLab Bot dcb475d86c Add latest changes from gitlab-org/gitlab@master 2020-07-25 00:09:23 +00:00
GitLab Bot 7ab026e2a2 Add latest changes from gitlab-org/gitlab@master 2020-07-23 18:10:06 +00:00
GitLab Bot 1d84a028b4 Add latest changes from gitlab-org/gitlab@master 2020-07-17 21:09:23 +00:00
GitLab Bot 518f1c923d Add latest changes from gitlab-org/gitlab@master 2020-07-17 12:09:53 +00:00
GitLab Bot 6110935892 Add latest changes from gitlab-org/gitlab@master 2020-07-17 06:09:11 +00:00
GitLab Bot 4bc0e06402 Add latest changes from gitlab-org/gitlab@master 2020-07-17 03:09:14 +00:00
GitLab Bot ff430539d5 Add latest changes from gitlab-org/gitlab@master 2020-07-13 15:09:08 +00:00
GitLab Bot 4a14cfd195 Add latest changes from gitlab-org/gitlab@master 2020-07-09 15:08:59 +00:00
GitLab Bot a93bf027c2 Add latest changes from gitlab-org/gitlab@master 2020-07-07 15:08:49 +00:00
GitLab Bot 7dc3246696 Add latest changes from gitlab-org/gitlab@master 2020-07-07 00:08:58 +00:00
GitLab Bot 27b73daa23 Add latest changes from gitlab-org/gitlab@master 2020-07-06 21:08:51 +00:00
GitLab Bot 9fc7cdf0b7 Add latest changes from gitlab-org/gitlab@master 2020-07-06 12:09:00 +00:00
GitLab Bot 840d5ecdbb Add latest changes from gitlab-org/gitlab@master 2020-07-02 15:09:08 +00:00
GitLab Bot 340f15b402 Add latest changes from gitlab-org/gitlab@master 2020-06-30 15:08:48 +00:00
GitLab Bot e1f8f12bbe Add latest changes from gitlab-org/gitlab@master 2020-06-19 15:08:39 +00:00
GitLab Bot d7b7232142 Add latest changes from gitlab-org/gitlab@master 2020-06-18 21:09:05 +00:00
GitLab Bot f2f748c081 Add latest changes from gitlab-org/gitlab@master 2020-06-10 15:08:07 +00:00
GitLab Bot b3ce1ce452 Add latest changes from gitlab-org/gitlab@master 2020-06-04 09:08:01 +00:00
GitLab Bot 1691cbe307 Add latest changes from gitlab-org/gitlab@master 2020-05-26 12:08:22 +00:00
GitLab Bot 1cf95147ea Add latest changes from gitlab-org/gitlab@master 2020-05-22 18:08:21 +00:00
GitLab Bot 143f7be045 Add latest changes from gitlab-org/gitlab@master 2020-05-12 06:09:37 +00:00
GitLab Bot 17c8111494 Add latest changes from gitlab-org/gitlab@master 2020-05-07 21:09:26 +00:00
GitLab Bot b42bf2a6d3 Add latest changes from gitlab-org/gitlab@master 2020-05-05 09:09:37 +00:00
GitLab Bot 4233d3aa86 Add latest changes from gitlab-org/gitlab@master 2020-04-29 12:10:00 +00:00
GitLab Bot 5c8c561ac6 Add latest changes from gitlab-org/gitlab@master 2020-04-24 12:10:16 +00:00
GitLab Bot 874ead9c3a Add latest changes from gitlab-org/gitlab@master 2020-04-14 15:09:44 +00:00
GitLab Bot 75ee59f7a1 Add latest changes from gitlab-org/gitlab@master 2020-04-13 12:10:03 +00:00
GitLab Bot 04baa85554 Add latest changes from gitlab-org/gitlab@master 2020-04-03 09:09:31 +00:00
GitLab Bot 7c38405be9 Add latest changes from gitlab-org/gitlab@master 2020-03-10 15:08:08 +00:00
GitLab Bot 82fa8a3d1e Add latest changes from gitlab-org/gitlab@master 2020-03-10 09:08:10 +00:00
GitLab Bot be81c1578d Add latest changes from gitlab-org/gitlab@master 2020-03-04 06:08:23 +00:00
GitLab Bot 7b52c7cb63 Add latest changes from gitlab-org/gitlab@master 2020-03-02 18:07:42 +00:00
GitLab Bot 7671216b60 Add latest changes from gitlab-org/gitlab@master 2020-02-24 21:09:08 +00:00
GitLab Bot b304a72312 Add latest changes from gitlab-org/gitlab@master 2020-02-17 15:09:01 +00:00
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