From 1e22e8a36cd407b6090ed13d8d8153beffc25ac8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 26 Oct 2015 22:27:24 +0100
Subject: [PATCH 1/2] use token for auth with github

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

From ac46a61d405d4b2663514c1fb8d8f3548406f536 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 27 Oct 2015 14:53:22 +0100
Subject: [PATCH 2/2] fix "the page display always the homepage"

Renaming the block name from layout_content => content.
---
 Resources/views/layout.html.twig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/views/layout.html.twig b/Resources/views/layout.html.twig
index af1044d16..19b237b7c 100644
--- a/Resources/views/layout.html.twig
+++ b/Resources/views/layout.html.twig
@@ -25,7 +25,7 @@
     {% endstylesheets %}
 {% endblock %}
 
-{% block layout_content %}
+{% block content %}
 
     <div class="grid-12 parent" id="header-person-name" >
         <div class="grid-10 push-1 parent">
@@ -129,4 +129,4 @@
         </section>
     </div>
 </div>
-{% endblock %}
\ No newline at end of file
+{% endblock content %}
\ No newline at end of file