Commit f3832206 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'update-templates' into 'master'

Update templates

See merge request gitlab-org/gitlab-ce!14844
parents d964eb11 12200391
...@@ -41,7 +41,8 @@ captures/ ...@@ -41,7 +41,8 @@ captures/
.idea/libraries .idea/libraries
# Keystore files # Keystore files
*.jks # Uncomment the following line if you do not want to check your keystore files in.
#*.jks
# External native build folder generated in Android Studio 2.2 and later # External native build folder generated in Android Studio 2.2 and later
.externalNativeBuild .externalNativeBuild
......
...@@ -31,3 +31,12 @@ Makefile.in ...@@ -31,3 +31,12 @@ Makefile.in
# http://www.gnu.org/software/texinfo # http://www.gnu.org/software/texinfo
/texinfo.tex /texinfo.tex
# http://www.gnu.org/software/m4/
m4/libtool.m4
m4/ltoptions.m4
m4/ltsugar.m4
m4/ltversion.m4
m4/lt~obsolete.m4
autom4te.cache
/_build /_build
/cover /cover
/deps /deps
/doc
/.fetch
erl_crash.dump erl_crash.dump
*.ez *.ez
*.beam *.beam
...@@ -10,3 +10,5 @@ ext/ ...@@ -10,3 +10,5 @@ ext/
modern.json modern.json
modern.jsonp modern.jsonp
resources/sass/.sass-cache/ resources/sass/.sass-cache/
resources/.arch-internal-preview.css
.arch-internal-preview.css
...@@ -19,4 +19,4 @@ slprj/ ...@@ -19,4 +19,4 @@ slprj/
octave-workspace octave-workspace
# Simulink autosave extension # Simulink autosave extension
.autosave *.autosave
...@@ -2,11 +2,17 @@ ...@@ -2,11 +2,17 @@
# #
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore # gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
## Build generated ## User settings
xcuserdata/
## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
*.xcscmblueprint
*.xccheckout
## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4)
build/ build/
DerivedData/ DerivedData/
*.moved-aside
## Various settings
*.pbxuser *.pbxuser
!default.pbxuser !default.pbxuser
*.mode1v3 *.mode1v3
...@@ -15,9 +21,3 @@ DerivedData/ ...@@ -15,9 +21,3 @@ DerivedData/
!default.mode2v3 !default.mode2v3
*.perspectivev3 *.perspectivev3
!default.perspectivev3 !default.perspectivev3
xcuserdata/
## Other
*.moved-aside
*.xccheckout
*.xcscmblueprint
# General # General
*.DS_Store .DS_Store
.AppleDouble .AppleDouble
.LSOverride .LSOverride
......
...@@ -251,7 +251,7 @@ ...@@ -251,7 +251,7 @@
/administrator/language/en-GB/en-GB.tpl_hathor.sys.ini /administrator/language/en-GB/en-GB.tpl_hathor.sys.ini
/administrator/language/en-GB/en-GB.xml /administrator/language/en-GB/en-GB.xml
/administrator/language/overrides/* /administrator/language/overrides/*
/administrator/logs/index.html /administrator/logs/*
/administrator/manifests/* /administrator/manifests/*
/administrator/modules/mod_custom/* /administrator/modules/mod_custom/*
/administrator/modules/mod_feed/* /administrator/modules/mod_feed/*
......
...@@ -18,3 +18,6 @@ _build/ ...@@ -18,3 +18,6 @@ _build/
# oasis generated files # oasis generated files
setup.data setup.data
setup.log setup.log
# Merlin configuring file for Vim and Emacs
.merlin
...@@ -23,6 +23,7 @@ wheels/ ...@@ -23,6 +23,7 @@ wheels/
*.egg-info/ *.egg-info/
.installed.cfg .installed.cfg
*.egg *.egg
MANIFEST
# PyInstaller # PyInstaller
# Usually these files are written by a python script from a template # Usually these files are written by a python script from a template
...@@ -51,6 +52,8 @@ coverage.xml ...@@ -51,6 +52,8 @@ coverage.xml
# Django stuff: # Django stuff:
*.log *.log
.static_storage/
.media/
local_settings.py local_settings.py
# Flask stuff: # Flask stuff:
...@@ -84,6 +87,8 @@ celerybeat-schedule ...@@ -84,6 +87,8 @@ celerybeat-schedule
env/ env/
venv/ venv/
ENV/ ENV/
env.bak/
venv.bak/
# Spyder project settings # Spyder project settings
.spyderproject .spyderproject
......
...@@ -31,11 +31,9 @@ ui_*.h ...@@ -31,11 +31,9 @@ ui_*.h
Makefile* Makefile*
*build-* *build-*
# Qt unit tests # Qt unit tests
target_wrapper.* target_wrapper.*
# QtCreator # QtCreator
*.autosave *.autosave
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
## Intermediate documents: ## Intermediate documents:
*.dvi *.dvi
*.xdv
*-converted-to.* *-converted-to.*
# these rules might exclude image files for figures etc. # these rules might exclude image files for figures etc.
# *.ps # *.ps
......
...@@ -5,3 +5,6 @@ ...@@ -5,3 +5,6 @@
# Module directory # Module directory
.terraform/ .terraform/
# Variable values for development
terraform.tfvars
## Ignore Umbraco files/folders generated for each instance
##
## Get latest from https://github.com/github/gitignore/blob/master/Umbraco.gitignore
# Note: VisualStudio gitignore rules may also be relevant # Note: VisualStudio gitignore rules may also be relevant
# Umbraco # Umbraco
......
...@@ -96,6 +96,9 @@ ipch/ ...@@ -96,6 +96,9 @@ ipch/
*.vspx *.vspx
*.sap *.sap
# Visual Studio Trace Files
*.e2e
# TFS 2012 Local Workspace # TFS 2012 Local Workspace
$tf/ $tf/
...@@ -297,3 +300,6 @@ __pycache__/ ...@@ -297,3 +300,6 @@ __pycache__/
*.btm.cs *.btm.cs
*.odx.cs *.odx.cs
*.xsd.cs *.xsd.cs
# OpenCover UI analysis results
OpenCover/
...@@ -19,7 +19,6 @@ temp/ ...@@ -19,7 +19,6 @@ temp/
data/DoctrineORMModule/Proxy/ data/DoctrineORMModule/Proxy/
data/DoctrineORMModule/cache/ data/DoctrineORMModule/cache/
# Legacy ZF1 # Legacy ZF1
demos/ demos/
extras/documentation extras/documentation
...@@ -29,7 +29,7 @@ format: ...@@ -29,7 +29,7 @@ format:
compile: compile:
stage: build stage: build
script: script:
- go build -race -ldflags "-extldflags '-static'" -o mybinary - go build -race -ldflags "-extldflags '-static'" -o $CI_PROJECT_DIR/mybinary
artifacts: artifacts:
paths: paths:
- mybinary - mybinary
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
# This template will build and test your projects as well as create the documentation. # This template will build and test your projects as well as create the documentation.
# #
# * Caches downloaded dependencies and plugins between invocation. # * Caches downloaded dependencies and plugins between invocation.
# * Does only verify merge requests but deploy built artifacts of the # * Verify but don't deploy merge requests.
# master branch. # * Deploy built artifacts from master branch only.
# * Shows how to use multiple jobs in test stage for verifying functionality # * Shows how to use multiple jobs in test stage for verifying functionality
# with multiple JDKs. # with multiple JDKs.
# * Uses site:stage to collect the documentation for multi-module projects. # * Uses site:stage to collect the documentation for multi-module projects.
...@@ -20,7 +20,7 @@ variables: ...@@ -20,7 +20,7 @@ variables:
MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true" MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN -Dorg.slf4j.simpleLogger.showDateTime=true -Djava.awt.headless=true"
# As of Maven 3.3.0 instead of this you may define these options in `.mvn/maven.config` so the same config is used # As of Maven 3.3.0 instead of this you may define these options in `.mvn/maven.config` so the same config is used
# when running from the command line. # when running from the command line.
# `installAtEnd` and `deployAtEnd`are only effective with recent version of the corresponding plugins. # `installAtEnd` and `deployAtEnd` are only effective with recent version of the corresponding plugins.
MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true" MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true"
# Cache downloaded dependencies and plugins between builds. # Cache downloaded dependencies and plugins between builds.
...@@ -100,4 +100,3 @@ pages: ...@@ -100,4 +100,3 @@ pages:
- public - public
only: only:
- master - master
# This file is a template, and might need editing before it works on your project.
image: python:latest
before_script:
- python -V # Print out python version for debugging
test:
script:
- python setup.py test
- pip install tox flake8 # you can also use tox
- tox -e py36,flake8
run:
script:
- python setup.py bdist_wheel
# an alternative approach is to install and run:
- pip install dist/*
# run the command here
artifacts:
paths:
- dist/*.whl
pages:
script:
- pip install sphinx sphinx-rtd-theme
- cd doc ; make html
- mv build/html/ ../public/
artifacts:
paths:
- public
only:
- master
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