Merge branch 'master' of gitlab.com:pages/ikiwiki

This commit is contained in:
Achilleas Pipinellis 2017-03-01 12:23:43 +01:00
commit 5c7650ed06

View file

@ -37,7 +37,7 @@ before_script:
test: test:
stage: test stage: test
script: script:
- ikiwiki --setup .ikiwiki/ikiwiki.setup --libdir themes/ikistrap/lib - ikiwiki --setup ikiwiki.setup --libdir themes/ikistrap/lib
only: only:
- branches - branches
- tags - tags
@ -45,7 +45,7 @@ test:
pages: pages:
stage: deploy stage: deploy
script: script:
- ikiwiki --setup .ikiwiki/ikiwiki.setup --libdir themes/ikistrap/lib - ikiwiki --setup ikiwiki.setup --libdir themes/ikistrap/lib
artifacts: artifacts:
paths: paths:
- public - public