Skip to content
Snippets Groups Projects
Commit d58c7dcd authored by Laurent Heirendt's avatar Laurent Heirendt :airplane:
Browse files

Merge branch 'develop' into 'master' 

Develop

See merge request R3/school/courses!89
parents 7f470611 1013c1a7
No related branches found
No related tags found
3 merge requests!153merge back master to develop,!124White theme only for git trilogy part 1,!89Develop
Pipeline #30205 passed
Stage: retrieve
    Stage: generate
      Stage: build
        Stage: deploy
          Hide whitespace changes
          Inline Side-by-side
          Showing
          with 0 additions and 2 deletions
          .gitlab-ci.yml
          + 0
          − 2
          View file @ d58c7dcd
          ...@@ -61,8 +61,6 @@ build:courses: ...@@ -61,8 +61,6 @@ build:courses:
          rules: rules:
          - if: $CI_COMMIT_BRANCH == "develop" - if: $CI_COMMIT_BRANCH == "develop"
          - if: $CI_COMMIT_BRANCH == "master" - if: $CI_COMMIT_BRANCH == "master"
          before_script:
          - git submodule update --init --recursive
          script: script:
          - bash .ci/deploy.sh - bash .ci/deploy.sh
          artifacts: artifacts:
          ......
          0% or .
          You are about to add 0 people to the discussion. Proceed with caution.
          Finish editing this message first!
          Please register or to comment