From dc902933ad8e250cbbb228bc9dca239596a59a36 Mon Sep 17 00:00:00 2001
From: frekk <frekk@ucc.asn.au>
Date: Tue, 23 Apr 2019 18:08:11 +0800
Subject: [PATCH] Merge from coffee-testing
---
.gitlab-ci.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f99432f..c6c9dc6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -45,6 +45,7 @@ deploy_testing:
on_stop: stop_testing
except:
- master
+ - merge_requests
deploy_staging:
stage: deploy
--
GitLab