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

vendor/gitignore/Global/VisualStudioCode.gitignore

-.vscode
-
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json

vendor/gitlab-ci-yml/Pages/Hexo.gitlab-ci.yml

 # Full project: https://gitlab.com/pages/hexo
-image: python:2.7
+image: node:4.2.2
 
-cache:
+pages:
+  cache:
     paths:
-  - vendor/
+    - node_modules/
 
-test:
-  stage: test
-  script:
-    - pip install hyde
-    - hyde gen
-  except:
-    - master
-
-pages:
-  stage: deploy
   script:
-    - pip install hyde
-    - hyde gen -d public
+  - npm install hexo-cli -g
+  - npm install
+  - hexo deploy
   artifacts:
     paths:
     - public

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