From 02a9450f0f2c662c70b56e155136e3acaf98b895 Mon Sep 17 00:00:00 2001
From: bmortier <benoit.mortier@opensides.be>
Date: Fri, 6 Apr 2018 10:02:04 +0200
Subject: [PATCH] Merge branch 'revert-5f944c7a' into '1.3-dev'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Merge branch '5731-pass-the-gitlab-ci-update-transiflex-only-on-the-main-branches' into '1.3-dev'

See merge request fusiondirectory/fd!215

(cherry picked from commit ac3c226d18f76be6800af6b9506de7f81d5cd1fd)

81021641 Revert "Merge branch…
---
 .gitlab-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 43ced71c8..efe084b7c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -109,7 +109,8 @@ fusiondirectory-update-locale:
 update-transifex:
   stage: transifex
   only:
-    - 1.3-dev
+    - branches
+    - tags
   before_script:
     - apt-get update -qq
     - apt-get install -y -qq gettext git php-cli transifex-client
-- 
GitLab