Commit 069c54a7 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'gitlab-update_templates' into 'master'

Update templates

See merge request !10619
parents 17bcf250 d41eb62e
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
# Kernel Module Compile Results # Kernel Module Compile Results
*.mod* *.mod*
*.cmd *.cmd
.tmp_versions/
modules.order modules.order
Module.symvers Module.symvers
Mkfile.old Mkfile.old
......
# See https://www.dartlang.org/tools/private-files.html # See https://www.dartlang.org/tools/private-files.html
# Files and directories created by pub # Files and directories created by pub
# SDK 1.20 and later (no longer creates packages directories)
.packages .packages
.pub/ .pub/
build/ build/
# If you're building an application, you may want to check-in your pubspec.lock
# Older SDK versions pubspec.lock
# (Include if the minimum SDK version specified in pubsepc.yaml is earlier than 1.20)
.project
.buildlog
**/packages/
# Files created by dart2js
# (Most Dart developers will use pub build to compile Dart, use/modify these
# rules if you intend to use dart2js directly
# Convention is to use extension '.dart.js' for Dart compiled to Javascript to
# differentiate from explicit Javascript files)
*.dart.js
*.part.js
*.js.deps
*.js.map
*.info.json
# Directory created by dartdoc # Directory created by dartdoc
# If you don't generate documentation locally you can remove this line.
doc/api/ doc/api/
# Don't commit pubspec lock file
# (Library packages only! Remove pattern if developing an application package)
pubspec.lock
...@@ -11,9 +11,6 @@ local.properties ...@@ -11,9 +11,6 @@ local.properties
.loadpath .loadpath
.recommenders .recommenders
# Eclipse Core
.project
# External tool builders # External tool builders
.externalToolBuilders/ .externalToolBuilders/
...@@ -26,9 +23,6 @@ local.properties ...@@ -26,9 +23,6 @@ local.properties
# CDT-specific (C/C++ Development Tooling) # CDT-specific (C/C++ Development Tooling)
.cproject .cproject
# JDT-specific (Eclipse Java Development Tools)
.classpath
# Java annotation processor (APT) # Java annotation processor (APT)
.factorypath .factorypath
......
...@@ -36,6 +36,9 @@ ...@@ -36,6 +36,9 @@
# JIRA plugin # JIRA plugin
atlassian-ide-plugin.xml atlassian-ide-plugin.xml
# Cursive Clojure plugin
.idea/replstate.xml
# Crashlytics plugin (for Android Studio and IntelliJ) # Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml com_crashlytics_export_strings.xml
crashlytics.properties crashlytics.properties
......
*.DS_Store *.DS_Store
.AppleDouble .AppleDouble
.LSOverride .LSOverride
# Icon must end with two \r # Icon must end with two \r
Icon Icon
# Thumbnails
# Thumbnails ._*
._*
# Files that might appear in the root of a volume
# Files that might appear in the root of a volume .DocumentRevisions-V100
.DocumentRevisions-V100 .fseventsd
.fseventsd .Spotlight-V100
.Spotlight-V100 .TemporaryItems
.TemporaryItems .Trashes
.Trashes .VolumeIcon.icns
.VolumeIcon.icns .com.apple.timemachine.donotpresent
.com.apple.timemachine.donotpresent
# Directories potentially created on remote AFP share
# Directories potentially created on remote AFP share .AppleDB
.AppleDB .AppleDesktop
.AppleDesktop Network Trash Folder
Network Trash Folder Temporary Items
Temporary Items .apdisk
.apdisk
......
...@@ -92,3 +92,6 @@ ENV/ ...@@ -92,3 +92,6 @@ ENV/
# Rope project settings # Rope project settings
.ropeproject .ropeproject
# mkdocs documentation
/site
...@@ -8,7 +8,7 @@ capybara-*.html ...@@ -8,7 +8,7 @@ capybara-*.html
/public/system /public/system
/coverage/ /coverage/
/spec/tmp /spec/tmp
**.orig *.orig
rerun.txt rerun.txt
pickle-email-*.html pickle-email-*.html
......
...@@ -148,6 +148,9 @@ _minted* ...@@ -148,6 +148,9 @@ _minted*
# pax # pax
*.pax *.pax
# pdfpcnotes
*.pdfpc
# sagetex # sagetex
*.sagetex.sage *.sagetex.sage
*.sagetex.py *.sagetex.py
......
...@@ -23,7 +23,6 @@ ExportedObj/ ...@@ -23,7 +23,6 @@ ExportedObj/
*.svd *.svd
*.pdb *.pdb
# Unity3D generated meta files # Unity3D generated meta files
*.pidb.meta *.pidb.meta
......
...@@ -219,6 +219,7 @@ UpgradeLog*.htm ...@@ -219,6 +219,7 @@ UpgradeLog*.htm
# SQL Server files # SQL Server files
*.mdf *.mdf
*.ldf *.ldf
*.ndf
# Business Intelligence projects # Business Intelligence projects
*.rdl.data *.rdl.data
...@@ -284,4 +285,4 @@ __pycache__/ ...@@ -284,4 +285,4 @@ __pycache__/
*.btp.cs *.btp.cs
*.btm.cs *.btm.cs
*.odx.cs *.odx.cs
*.xsd.cs *.xsd.cs
\ No newline at end of file
...@@ -26,9 +26,24 @@ before_script: ...@@ -26,9 +26,24 @@ before_script:
# - apt-get update -q && apt-get install nodejs -yqq # - apt-get update -q && apt-get install nodejs -yqq
- pip install -r requirements.txt - pip install -r requirements.txt
# To get Django tests to work you may need to create a settings file using
# the following DATABASES:
#
# DATABASES = {
# 'default': {
# 'ENGINE': 'django.db.backends.postgresql_psycopg2',
# 'NAME': 'ci',
# 'USER': 'postgres',
# 'PASSWORD': 'postgres',
# 'HOST': 'postgres',
# 'PORT': '5432',
# },
# }
#
# and then adding `--settings app.settings.ci` (or similar) to the test command
test: test:
variables: variables:
DATABASE_URL: "postgresql://postgres:postgres@postgres:5432/$POSTGRES_DB" DATABASE_URL: "postgresql://postgres:postgres@postgres:5432/$POSTGRES_DB"
script: script:
- python manage.py migrate
- python manage.py test - python manage.py test
# Full project: https://gitlab.com/pages/hexo # Full project: https://gitlab.com/pages/hexo
image: node:4.2.2 image: node:6.10.0
pages: pages:
cache:
paths:
- node_modules/
script: script:
- npm install hexo-cli -g
- npm install - npm install
- hexo deploy - ./node_modules/hexo/bin/hexo generate
artifacts: artifacts:
paths: paths:
- public - public
cache:
paths:
- node_modules
key: project
only: only:
- master - master
# Template project: https://gitlab.com/pages/jekyll # Template project: https://gitlab.com/pages/jekyll
# Docs: https://docs.gitlab.com/ce/pages/ # Docs: https://docs.gitlab.com/ce/pages/
# Jekyll version: 3.4.0
image: ruby:2.3 image: ruby:2.3
variables:
JEKYLL_ENV: production
before_script: before_script:
- bundle install - bundle install
...@@ -25,4 +27,4 @@ pages: ...@@ -25,4 +27,4 @@ pages:
- public - public
only: only:
- master - master
\ No newline at end of file
...@@ -9,7 +9,7 @@ before_script: ...@@ -9,7 +9,7 @@ before_script:
- apt-get install apt-transport-https -yqq - apt-get install apt-transport-https -yqq
# Add keyserver for SBT # Add keyserver for SBT
- echo "deb http://dl.bintray.com/sbt/debian /" | tee -a /etc/apt/sources.list.d/sbt.list - echo "deb http://dl.bintray.com/sbt/debian /" | tee -a /etc/apt/sources.list.d/sbt.list
- apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 642AC823 - apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2EE0EA64E40A89B84B2DF73499E82A75642AC823
# Install SBT # Install SBT
- apt-get update -yqq - apt-get update -yqq
- apt-get install sbt -yqq - apt-get install sbt -yqq
......
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