Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
f3832206
Commit
f3832206
authored
Oct 12, 2017
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'update-templates' into 'master'
Update templates See merge request gitlab-org/gitlab-ce!14844
parents
d964eb11
12200391
Changes
19
Hide whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
85 additions
and
21 deletions
+85
-21
vendor/gitignore/Android.gitignore
vendor/gitignore/Android.gitignore
+2
-1
vendor/gitignore/Autotools.gitignore
vendor/gitignore/Autotools.gitignore
+9
-0
vendor/gitignore/Elixir.gitignore
vendor/gitignore/Elixir.gitignore
+2
-0
vendor/gitignore/ExtJs.gitignore
vendor/gitignore/ExtJs.gitignore
+2
-0
vendor/gitignore/Global/Matlab.gitignore
vendor/gitignore/Global/Matlab.gitignore
+1
-1
vendor/gitignore/Global/Xcode.gitignore
vendor/gitignore/Global/Xcode.gitignore
+9
-9
vendor/gitignore/Global/macOS.gitignore
vendor/gitignore/Global/macOS.gitignore
+1
-1
vendor/gitignore/Joomla.gitignore
vendor/gitignore/Joomla.gitignore
+1
-1
vendor/gitignore/OCaml.gitignore
vendor/gitignore/OCaml.gitignore
+3
-0
vendor/gitignore/Python.gitignore
vendor/gitignore/Python.gitignore
+5
-0
vendor/gitignore/Qt.gitignore
vendor/gitignore/Qt.gitignore
+0
-2
vendor/gitignore/TeX.gitignore
vendor/gitignore/TeX.gitignore
+1
-0
vendor/gitignore/Terraform.gitignore
vendor/gitignore/Terraform.gitignore
+3
-0
vendor/gitignore/Umbraco.gitignore
vendor/gitignore/Umbraco.gitignore
+4
-0
vendor/gitignore/VisualStudio.gitignore
vendor/gitignore/VisualStudio.gitignore
+6
-0
vendor/gitignore/ZendFramework.gitignore
vendor/gitignore/ZendFramework.gitignore
+0
-1
vendor/gitlab-ci-yml/Go.gitlab-ci.yml
vendor/gitlab-ci-yml/Go.gitlab-ci.yml
+1
-1
vendor/gitlab-ci-yml/Maven.gitlab-ci.yml
vendor/gitlab-ci-yml/Maven.gitlab-ci.yml
+3
-4
vendor/gitlab-ci-yml/Python.gitlab-ci.yml
vendor/gitlab-ci-yml/Python.gitlab-ci.yml
+32
-0
No files found.
vendor/gitignore/Android.gitignore
View file @
f3832206
...
...
@@ -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
View file @
f3832206
...
...
@@ -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
View file @
f3832206
/_build
/cover
/deps
/doc
/.fetch
erl_crash.dump
*.ez
*.beam
vendor/gitignore/ExtJs.gitignore
View file @
f3832206
...
...
@@ -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
View file @
f3832206
...
...
@@ -19,4 +19,4 @@ slprj/
octave-workspace
# Simulink autosave extension
.autosave
*
.autosave
vendor/gitignore/Global/Xcode.gitignore
View file @
f3832206
...
...
@@ -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
View file @
f3832206
# General
*
.DS_Store
.DS_Store
.AppleDouble
.LSOverride
...
...
vendor/gitignore/Joomla.gitignore
View file @
f3832206
...
...
@@ -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
View file @
f3832206
...
...
@@ -18,3 +18,6 @@ _build/
# oasis generated files
setup.data
setup.log
# Merlin configuring file for Vim and Emacs
.merlin
vendor/gitignore/Python.gitignore
View file @
f3832206
...
...
@@ -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
View file @
f3832206
...
...
@@ -31,11 +31,9 @@ ui_*.h
Makefile*
*build-*
# Qt unit tests
target_wrapper.*
# QtCreator
*.autosave
...
...
vendor/gitignore/TeX.gitignore
View file @
f3832206
...
...
@@ -13,6 +13,7 @@
## Intermediate documents:
*.dvi
*.xdv
*-converted-to.*
# these rules might exclude image files for figures etc.
# *.ps
...
...
vendor/gitignore/Terraform.gitignore
View file @
f3832206
...
...
@@ -5,3 +5,6 @@
# Module directory
.terraform/
# Variable values for development
terraform.tfvars
vendor/gitignore/Umbraco.gitignore
View file @
f3832206
## 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
View file @
f3832206
...
...
@@ -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
View file @
f3832206
...
...
@@ -19,7 +19,6 @@ temp/
data/DoctrineORMModule/Proxy/
data/DoctrineORMModule/cache/
# Legacy ZF1
demos/
extras/documentation
vendor/gitlab-ci-yml/Go.gitlab-ci.yml
View file @
f3832206
...
...
@@ -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
View file @
f3832206
...
...
@@ -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
0 → 100644
View file @
f3832206
# 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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment