diff options
author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-10 22:06:30 +0200 |
---|---|---|
committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-10 22:06:30 +0200 |
commit | d5fac1ced3daa33a7275aff9a4be88a741ee78c9 (patch) | |
tree | 06c308909f91d19de4c35946a678cb56b055f8e9 /.gitlab-ci.yml | |
parent | 2fd009d23810939a77ddc1716ab4250ee18826fa (diff) | |
parent | b4e84809e8170a43126507da0bc6a3b94c33804b (diff) | |
download | gitlab-ce-d5fac1ced3daa33a7275aff9a4be88a741ee78c9.tar.gz |
Merge remote-tracking branch 'origin/master' into retry-spinach-tests
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r-- | .gitlab-ci.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 965de5e50e9..aa84a9e4da2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -61,6 +61,8 @@ update-knapsack: - scripts/merge-reports knapsack/rspec_report.json knapsack/rspec_node_*.json - scripts/merge-reports knapsack/spinach_report.json knapsack/spinach_node_*.json - rm -f knapsack/*_node_*.json + only: + - master # Execute all testing suites |