diff options
| author | James Lopez <james@jameslopez.es> | 2016-02-18 11:12:51 +0100 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-02-18 11:12:51 +0100 |
| commit | c3fe7388caa1bd49f25434b8109c4a1ab42d5b27 (patch) | |
| tree | 2aebd2f39a4c86d7995edcbb2314a45d74e9cdc6 | |
| parent | c9be4d65f2d3f6695e99cc7f99ad889b48780e3b (diff) | |
| download | gitlab-ce-c3fe7388caa1bd49f25434b8109c4a1ab42d5b27.tar.gz | |
resolve merge conflict
| -rw-r--r-- | .gitlab-ci.yml | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2107e07c1f6..cc711bf9d6b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -179,6 +179,7 @@ spec:feature:ruby21: - mysql spec:api:ruby21: + stage: test image: ruby:2.1 only: - master @@ -208,6 +209,7 @@ spec:models:ruby21: - mysql spec:lib:ruby21: + stage: test image: ruby:2.1 only: - master @@ -222,6 +224,7 @@ spec:lib:ruby21: - mysql spec:services:ruby21: + stage: test image: ruby:2.1 only: - master @@ -236,6 +239,7 @@ spec:services:ruby21: - mysql spec:benchmark:ruby21: + stage: test image: ruby:2.1 only: - master @@ -251,6 +255,7 @@ spec:benchmark:ruby21: allow_failure: true spec:other:ruby21: + stage: test image: ruby:2.1 only: - master @@ -265,6 +270,7 @@ spec:other:ruby21: - mysql spinach:project:half:ruby21: + stage: test image: ruby:2.1 only: - master @@ -279,6 +285,7 @@ spinach:project:half:ruby21: - mysql spinach:project:rest:ruby21: + stage: test image: ruby:2.1 only: - master @@ -293,6 +300,7 @@ spinach:project:rest:ruby21: - mysql spinach:other:ruby21: + stage: test image: ruby:2.1 only: - master @@ -310,7 +318,7 @@ spinach:other:ruby21: notify:slack: stage: notifications script: - - source ./scripts/notify_slack.sh "#notifications" "Build failed for master/tags!" + - source ./scripts/notify_slack.sh "#builds" "Build failed for master/tags!" when: on_failure only: - master@gitlab-org/gitlab-ce |