diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4fba068b3..0761e66b6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ services: - chill/database:latest before_script: - - export GITHUB_COMPOSER_AUTH=$GITHUB_TOKEN + - composer config github-oauth.github.com $GITHUB_TOKEN - composer install --no-interaction - cp Tests/Fixtures/App/app/config/parameters.gitlab-ci.yml Tests/Fixtures/App/app/config/parameters.yml - php Tests/Fixtures/App/app/console.php --env=test cache:warmup @@ -14,4 +14,4 @@ test:php-5.6: script: phpunit --testdox test:php-7: stage: test - script: phpunit --testdox + script: phpunit --testdox \ No newline at end of file diff --git a/Resources/views/layout.html.twig b/Resources/views/layout.html.twig index 84f283a8e..1dd448a90 100644 --- a/Resources/views/layout.html.twig +++ b/Resources/views/layout.html.twig @@ -100,62 +100,12 @@ {% endblock %} {% block vertical_menu_content %} - - {# Note: activeRouteKey should be defined in Controller or child layout #} - {{ chill_menu('person', { - 'layout': 'ChillPersonBundle::menu.html.twig', - 'args' : {'person_id': person.id }, - 'activeRouteKey': activeRouteKey - }) }} - + {{ chill_menu('person', { + 'layout': 'ChillPersonBundle::menu.html.twig', + 'args' : {'person_id': person.id }, + 'activeRouteKey': activeRouteKey + }) }} {% endblock %} {% block layout_content %} - - {# -