Merge branch 'develop' into 'master'

Regular merge of develop See merge request R3.training/git.slides!26

Merge branch 'develop' into 'master'
Regular merge of develop See merge request R3.training/git.slides!26
69e758fb · Laurent Heirendt · 4a773d44 · 975962e1 · 69e758fb · 69e758fb
Commit 69e758fb authored 6 years ago by Laurent Heirendt
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,6 +3,7 @@ image: digitallyseamless/nodejs-bower-grunt
 pages:
  stage: deploy
  only:
+    - develop
    - master
  script:
    - npm install --global npm@latest
@@ -11,6 +12,7 @@ pages:
    - npm install -g generator-reveal
    - npm install -g bower
    - npm install
+    - rm -rf public
    - grunt dist
  artifacts:

--- a/img
+++ b/img
+slides/img
\ No newline at end of file
--- a/img/Git-Logo-Black.png
+++ b/img/Git-Logo-Black.png
--- a/img/branch-commit.png
+++ b/img/branch-commit.png
--- a/img/branch-create.png
+++ b/img/branch-create.png
--- a/img/branch-i-state.graffle
+++ b/img/branch-i-state.graffle
--- a/img/branch-master.png
+++ b/img/branch-master.png
--- a/img/branch-merge.png
+++ b/img/branch-merge.png
--- a/img/github_app.png
+++ b/img/github_app.png
--- a/img/gray-linen-background-texture_58348.jpg
+++ b/img/gray-linen-background-texture_58348.jpg
--- a/img/linus.jpg
+++ b/img/linus.jpg
--- a/img/logoLCSB.png
+++ b/img/logoLCSB.png
--- a/img/remote-0-master.png
+++ b/img/remote-0-master.png
--- a/img/remote-1-remote.png
+++ b/img/remote-1-remote.png
--- a/img/remote-2-push.png
+++ b/img/remote-2-push.png
--- a/img/remote-i-state.graffle
+++ b/img/remote-i-state.graffle
--- a/img/sbgBackgroundWhite.jpg
+++ b/img/sbgBackgroundWhite.jpg
--- a/img/whiteBG.jpg
+++ b/img/whiteBG.jpg
--- a/slides/list.json
+++ b/slides/list.json
@@ -2,61 +2,61 @@
    {
        "filename": "index.md",
        "attr": {
-            "data-background": "../img/sbgBackgroundWhite.jpg"
+            "data-background": "img/sbgBackgroundWhite.jpg"
        }
    },
    {
        "filename": "overview.md",
        "attr": {
-          "data-background": "../img/whiteBG.jpg"
+          "data-background": "img/whiteBG.jpg"
        }
    },
    {
        "filename": "the_terminal.md",
        "attr": {
-          "data-background": "../img/whiteBG.jpg"
+          "data-background": "img/whiteBG.jpg"
        }
    },
    {
        "filename": "what_is_git.md",
        "attr": {
-          "data-background": "../img/whiteBG.jpg"
+          "data-background": "img/whiteBG.jpg"
        }
    },
    {
        "filename": "installation.md",
        "attr": {
-          "data-background": "../img/whiteBG.jpg"
+          "data-background": "img/whiteBG.jpg"
        }
    },
    {
        "filename": "essential_commands.md",
        "attr": {
-          "data-background": "../img/whiteBG.jpg"
+          "data-background": "img/whiteBG.jpg"
        }
    },
    {
        "filename": "github_gitlab.md",
        "attr": {
-          "data-background": "../img/whiteBG.jpg"
+          "data-background": "img/whiteBG.jpg"
        }
    },
    {
        "filename": "branches.md",
        "attr": {
-          "data-background": "../img/whiteBG.jpg"
+          "data-background": "img/whiteBG.jpg"
        }
    },
    {
        "filename": "best_practices.md",
        "attr": {
-          "data-background": "../img/whiteBG.jpg"
+          "data-background": "img/whiteBG.jpg"
        }
    },
    {
        "filename": "thanks.md",
        "attr": {
-          "data-background": "../img/whiteBG.jpg"
+          "data-background": "img/whiteBG.jpg"
        }
    }
 ]