Commit 46e9d8f0 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'update-templates' into 'master'

Update templates

There was a copy pasta in the templates, therefor another MR with updates.

See merge request !5714
parents 2836b473 fda37b2f
.vscode .vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
# Full project: https://gitlab.com/pages/hexo # Full project: https://gitlab.com/pages/hexo
image: python:2.7 image: node:4.2.2
cache: pages:
cache:
paths: paths:
- vendor/ - node_modules/
test:
stage: test
script:
- pip install hyde
- hyde gen
except:
- master
pages:
stage: deploy
script: script:
- pip install hyde - npm install hexo-cli -g
- hyde gen -d public - npm install
- hexo deploy
artifacts: artifacts:
paths: paths:
- public - public
......
...@@ -10,6 +10,9 @@ services: ...@@ -10,6 +10,9 @@ services:
- redis:latest - redis:latest
- postgres:latest - postgres:latest
variables:
POSTGRES_DB: database_name
# Cache gems in between builds # Cache gems in between builds
cache: cache:
paths: paths:
...@@ -34,6 +37,9 @@ rspec: ...@@ -34,6 +37,9 @@ rspec:
- rspec spec - rspec spec
rails: rails:
variables:
DATABASE_URL: "postgresql://postgres:postgres@postgres:5432/$POSTGRES_DB"
script: script:
- bundle exec rake db:migrate - bundle exec rake db:migrate
- bundle exec rake db:seed
- bundle exec rake test - bundle exec rake test
Markdown is supported
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