summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZ.J. van de Weg <zegerjan@gitlab.com>2016-08-08 16:39:24 +0200
committerZ.J. van de Weg <zegerjan@gitlab.com>2016-08-08 16:39:24 +0200
commitfda37b2f371a8622fbbad07b5ab0293bd50b58ab (patch)
tree1ce8614f9fcaed7f132830816587ab5709cc07c9
parent91030230545a199a86c2742600a7a2e68ef75c98 (diff)
downloadgitlab-ce-fda37b2f371a8622fbbad07b5ab0293bd50b58ab.tar.gz
Update templates
-rw-r--r--vendor/gitignore/Global/VisualStudioCode.gitignore6
-rw-r--r--vendor/gitlab-ci-yml/Pages/Hexo.gitlab-ci.yml26
-rw-r--r--vendor/gitlab-ci-yml/Ruby.gitlab-ci.yml6
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