diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-08-08 15:24:34 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-08-08 15:24:34 +0000 |
| commit | 46e9d8f08db13659fac02e61ef6ce8917bf6a0ac (patch) | |
| tree | 1f4d507a7ffb82566a1ab0f75fa29be678177b6b | |
| parent | 2836b47370434bc96cc54766c898577421ba14e2 (diff) | |
| parent | fda37b2f371a8622fbbad07b5ab0293bd50b58ab (diff) | |
| download | gitlab-ce-46e9d8f08db13659fac02e61ef6ce8917bf6a0ac.tar.gz | |
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
| -rw-r--r-- | vendor/gitignore/Global/VisualStudioCode.gitignore | 6 | ||||
| -rw-r--r-- | vendor/gitlab-ci-yml/Pages/Hexo.gitlab-ci.yml | 26 | ||||
| -rw-r--r-- | vendor/gitlab-ci-yml/Ruby.gitlab-ci.yml | 6 |
3 files changed, 19 insertions, 19 deletions
diff --git a/vendor/gitignore/Global/VisualStudioCode.gitignore b/vendor/gitignore/Global/VisualStudioCode.gitignore index faa18382a3c..d9960081c98 100644 --- a/vendor/gitignore/Global/VisualStudioCode.gitignore +++ b/vendor/gitignore/Global/VisualStudioCode.gitignore @@ -1,2 +1,4 @@ -.vscode - +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json diff --git a/vendor/gitlab-ci-yml/Pages/Hexo.gitlab-ci.yml b/vendor/gitlab-ci-yml/Pages/Hexo.gitlab-ci.yml index b468d79bcad..908463c9d12 100644 --- a/vendor/gitlab-ci-yml/Pages/Hexo.gitlab-ci.yml +++ b/vendor/gitlab-ci-yml/Pages/Hexo.gitlab-ci.yml @@ -1,25 +1,17 @@ # Full project: https://gitlab.com/pages/hexo -image: python:2.7 - -cache: - paths: - - vendor/ - -test: - stage: test - script: - - pip install hyde - - hyde gen - except: - - master +image: node:4.2.2 pages: - stage: deploy + cache: + paths: + - node_modules/ + script: - - pip install hyde - - hyde gen -d public + - npm install hexo-cli -g + - npm install + - hexo deploy artifacts: paths: - public only: - - master + - master diff --git a/vendor/gitlab-ci-yml/Ruby.gitlab-ci.yml b/vendor/gitlab-ci-yml/Ruby.gitlab-ci.yml index 16a685ee03d..166f146ee05 100644 --- a/vendor/gitlab-ci-yml/Ruby.gitlab-ci.yml +++ b/vendor/gitlab-ci-yml/Ruby.gitlab-ci.yml @@ -10,6 +10,9 @@ services: - redis:latest - postgres:latest +variables: + POSTGRES_DB: database_name + # Cache gems in between builds cache: paths: @@ -34,6 +37,9 @@ rspec: - rspec spec rails: + variables: + DATABASE_URL: "postgresql://postgres:postgres@postgres:5432/$POSTGRES_DB" script: - bundle exec rake db:migrate + - bundle exec rake db:seed - bundle exec rake test |