Merge branch 'update-templates' into 'master'

Update templates

See merge request gitlab-org/gitlab-ce!14844

vendor/gitignore/Android.gitignore

@@ -41,7 +41,8 @@ captures/
 .idea/libraries
 # 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
 .externalNativeBuild

vendor/gitignore/Autotools.gitignore

@@ -31,3 +31,12 @@ Makefile.in
 # http://www.gnu.org/software/texinfo
 /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

vendor/gitignore/Elixir.gitignore

 /_build
 /cover
 /deps
+/doc
+/.fetch
 erl_crash.dump
 *.ez
 *.beam

vendor/gitignore/ExtJs.gitignore

@@ -10,3 +10,5 @@ ext/
 modern.json
 modern.jsonp
 resources/sass/.sass-cache/
+resources/.arch-internal-preview.css
+.arch-internal-preview.css

vendor/gitignore/Global/Matlab.gitignore

@@ -19,4 +19,4 @@ slprj/
 octave-workspace
 # Simulink autosave extension
-.autosave
+*.autosave

vendor/gitignore/Global/Xcode.gitignore

@@ -2,11 +2,17 @@
 #
 # 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/
 DerivedData/
-
-## Various settings
+*.moved-aside
 *.pbxuser
 !default.pbxuser
 *.mode1v3
@@ -15,9 +21,3 @@ DerivedData/
 !default.mode2v3
 *.perspectivev3
 !default.perspectivev3
-xcuserdata/
-
-## Other
-*.moved-aside
-*.xccheckout
-*.xcscmblueprint

vendor/gitignore/Global/macOS.gitignore

 # General
-*.DS_Store
+.DS_Store
 .AppleDouble
 .LSOverride

vendor/gitignore/Joomla.gitignore

@@ -251,7 +251,7 @@
 /administrator/language/en-GB/en-GB.tpl_hathor.sys.ini
 /administrator/language/en-GB/en-GB.xml
 /administrator/language/overrides/*
-/administrator/logs/index.html
+/administrator/logs/*
 /administrator/manifests/*
 /administrator/modules/mod_custom/*
 /administrator/modules/mod_feed/*

vendor/gitignore/OCaml.gitignore

@@ -18,3 +18,6 @@ _build/
 # oasis generated files
 setup.data
 setup.log
+
+# Merlin configuring file for Vim and Emacs
+.merlin

vendor/gitignore/Python.gitignore

@@ -23,6 +23,7 @@ wheels/
 *.egg-info/
 .installed.cfg
 *.egg
+MANIFEST
 # PyInstaller
 #  Usually these files are written by a python script from a template
@@ -51,6 +52,8 @@ coverage.xml
 # Django stuff:
 *.log
+.static_storage/
+.media/
 local_settings.py
 # Flask stuff:
@@ -84,6 +87,8 @@ celerybeat-schedule
 env/
 venv/
 ENV/
+env.bak/
+venv.bak/
 # Spyder project settings
 .spyderproject

vendor/gitignore/Qt.gitignore

@@ -31,11 +31,9 @@ ui_*.h
 Makefile*
 *build-*
-
 # Qt unit tests
 target_wrapper.*
-
 # QtCreator
 *.autosave

vendor/gitignore/TeX.gitignore

@@ -13,6 +13,7 @@
 ## Intermediate documents:
 *.dvi
+*.xdv
 *-converted-to.*
 # these rules might exclude image files for figures etc.
 # *.ps

vendor/gitignore/Terraform.gitignore

@@ -5,3 +5,6 @@
 # Module directory
 .terraform/
+
+# Variable values for development
+terraform.tfvars

vendor/gitignore/Umbraco.gitignore

+## 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
 # Umbraco

vendor/gitignore/VisualStudio.gitignore

@@ -96,6 +96,9 @@ ipch/
 *.vspx
 *.sap
+# Visual Studio Trace Files
+*.e2e
+
 # TFS 2012 Local Workspace
 $tf/
@@ -297,3 +300,6 @@ __pycache__/
 *.btm.cs
 *.odx.cs
 *.xsd.cs
+
+# OpenCover UI analysis results
+OpenCover/

vendor/gitignore/ZendFramework.gitignore

@@ -19,7 +19,6 @@ temp/
 data/DoctrineORMModule/Proxy/
 data/DoctrineORMModule/cache/
-
 # Legacy ZF1
 demos/
 extras/documentation

vendor/gitlab-ci-yml/Go.gitlab-ci.yml

@@ -29,7 +29,7 @@ format:
 compile:
     stage: build
     script:
-      - go build -race -ldflags "-extldflags '-static'" -o mybinary
+      - go build -race -ldflags "-extldflags '-static'" -o $CI_PROJECT_DIR/mybinary
     artifacts:
       paths:
         - mybinary

vendor/gitlab-ci-yml/Maven.gitlab-ci.yml

@@ -7,8 +7,8 @@
 # This template will build and test your projects as well as create the documentation.
 #
 # * Caches downloaded dependencies and plugins between invocation.
-# * Does only verify merge requests but deploy built artifacts of the
-#   master branch.
+# * Verify but don't deploy merge requests.
+# * Deploy built artifacts from master branch only.
 # * Shows how to use multiple jobs in test stage for verifying functionality
 #   with multiple JDKs.
 # * Uses site:stage to collect the documentation for multi-module projects.
@@ -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"
   # 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.
-  # `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"
 # Cache downloaded dependencies and plugins between builds.
@@ -100,4 +100,3 @@ pages:
     - public
   only:
     - master
-

vendor/gitlab-ci-yml/Python.gitlab-ci.yml

+# 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