gitlab-org--gitlab-foss

Commit Graph

Author	SHA1	Message	Date
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

Author

SHA1

Message

Date

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

3 Commits