Merge branch '1.3' of github.com:ezsystems/ezplatform-admin-ui into 1.4

ezsystems · Feb 13, 2019 · d109dbc · d109dbc
2 parents c9f3de8 + 9c90fff
commit d109dbc
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,13 +10,6 @@ matrix:
           - BEHAT_OPTS="--profile=adminui --suite=adminui --no-interaction -vv"
           - SYMFONY_ENV=behat
           - SYMFONY_DEBUG=1
-        - php: 7.1
-          env:
-          - WEB_HOST="varnish"
-          - COMPOSE_FILE="doc/docker/base-dev.yml:doc/docker/varnish.yml:doc/docker/redis.yml:doc/docker/selenium.yml"
-          - BEHAT_OPTS="--profile=adminui --suite=adminui --no-interaction --tags=~@EZP-29291-excluded"
-          - SYMFONY_ENV=behat
-          - SYMFONY_DEBUG=1
 
 cache:
     directories:

diff --git a/src/bundle/Resources/views/fieldtypes/edit/ezmedia.html.twig b/src/bundle/Resources/views/fieldtypes/edit/ezmedia.html.twig
@@ -5,7 +5,6 @@
 {%- block ezplatform_fieldtype_ezmedia_row -%}
     {% set preview_block_name = 'ezmedia_preview' %}
     {% set max_file_size = min(form.parent.vars.value.fieldDefinition.validatorConfiguration.FileSizeValidator.maxFileSize * 1024 * 1024, max_upload_size)|round %}
-    {% set attr = attr|merge({'accept': 'video/*'}) %}
     {{ block('binary_base_row') }}
 {%- endblock -%}