Skip to content
GitLab
Commit 56415b41 authored by bmortier's avatar bmortier
Browse files

Merge branch 'cherry-pick-ac3c226d' into '1.2-fixes' 

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

See merge request fusiondirectory/fd!216
parents 0e98773f 02a9450f
dev 6342-update-the-locales-for-1-5 6344-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen 6365-core-locking-mechanism-is-not-changing-the-mail-ressource-it-does-lock-the-mail-account 6365-core-when-lock-mechanism-is-trigger-the-user-should-not-be-editable-if-not-unlock 6378-orcid-test-method-is-wrong-and-break-orcid-saving 6380-core-new-password-method-argon-2 core-php8 master fusiondirectory-1.5 fusiondirectory-1.4 fusiondirectory-1.3.1 fusiondirectory-1.3 fusiondirectory-1.2.3 fusiondirectory-1.2.2 fusiondirectory-1.2.1
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 1 deletion
+2 -1
.gitlab-ci.yml
+ 2
− 1
View file @ 56415b41
...@@ -109,7 +109,8 @@ fusiondirectory-update-locale: ...@@ -109,7 +109,8 @@ fusiondirectory-update-locale:
update-transifex: update-transifex:
stage: transifex stage: transifex
only: only:
- 1.3-dev - branches
- tags
before_script: before_script:
- apt-get update -qq - apt-get update -qq
- apt-get install -y -qq gettext git php-cli transifex-client - apt-get install -y -qq gettext git php-cli transifex-client
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment