Skip to content
Snippets Groups Projects
Commit 7b640edb authored by GitLab CI's avatar GitLab CI
Browse files

Merge branch 'develop' into 'main'

Merging develop into main

See merge request !96
parents c1d6b851 718a8ff9
No related branches found
No related tags found
1 merge request!96Merging develop into main
Pipeline #1187938 passed
...@@ -590,6 +590,10 @@ services: ...@@ -590,6 +590,10 @@ services:
{% endif %} {% endif %}
{% if mailhog.enable %} {% if mailhog.enable %}
- CYPRESS_mailhogUrl={{ projectprotocol }}://mailhog-{{ projectdomain }}{{ projectport }} - CYPRESS_mailhogUrl={{ projectprotocol }}://mailhog-{{ projectdomain }}{{ projectport }}
{% endif %}
{% if basicauth.enable %}
- CYPRESS_basicauth_user={{ basicauth.user }}
- CYPRESS_basicauth_pass={{ basicauth.pass }}
{% endif %} {% endif %}
- PHP_CONTAINER={{ projectname }}-php-1 - PHP_CONTAINER={{ projectname }}-php-1
{% if not drupal.live|default(0) %} {% if not drupal.live|default(0) %}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment