Merge branch 'revert-5f944c7a' into '1.3-dev'

Merge branch '5731-pass-the-gitlab-ci-update-transiflex-only-on-the-main-branches' into '1.3-dev' See merge request fusiondirectory/fd!215

Merge branch 'revert-5f944c7a' into '1.3-dev'
Merge branch '5731-pass-the-gitlab-ci-update-transiflex-only-on-the-main-branches' into '1.3-dev' See merge request fusiondirectory/fd!215
ac3c226d · bmortier · 8b370b22 · 81021641 · ac3c226d
Commit ac3c226d authored 7 years ago by bmortier
Hide whitespace changes
Inline Side-by-side

Showing

with 2 additions and 1 deletion
+2 -1
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -145,7 +145,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