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
4a463039
Commit
4a463039
authored
Jan 11, 2017
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'update-templates-8-16' into 'master'
Update templates - 8.16 RC1 See merge request !8505
parents
4404ea86
930dd639
Changes
34
Hide whitespace changes
Inline
Side-by-side
Showing
34 changed files
with
295 additions
and
66 deletions
+295
-66
vendor/gitignore/Android.gitignore
vendor/gitignore/Android.gitignore
+2
-0
vendor/gitignore/Autotools.gitignore
vendor/gitignore/Autotools.gitignore
+15
-0
vendor/gitignore/CMake.gitignore
vendor/gitignore/CMake.gitignore
+1
-0
vendor/gitignore/Clojure.gitignore
vendor/gitignore/Clojure.gitignore
+1
-13
vendor/gitignore/Clojure.gitignore
vendor/gitignore/Clojure.gitignore
+1
-13
vendor/gitignore/CodeIgniter.gitignore
vendor/gitignore/CodeIgniter.gitignore
+5
-0
vendor/gitignore/CommonLisp.gitignore
vendor/gitignore/CommonLisp.gitignore
+14
-0
vendor/gitignore/Coq.gitignore
vendor/gitignore/Coq.gitignore
+28
-1
vendor/gitignore/Dart.gitignore
vendor/gitignore/Dart.gitignore
+8
-2
vendor/gitignore/Elisp.gitignore
vendor/gitignore/Elisp.gitignore
+6
-0
vendor/gitignore/Elixir.gitignore
vendor/gitignore/Elixir.gitignore
+1
-0
vendor/gitignore/Global/Emacs.gitignore
vendor/gitignore/Global/Emacs.gitignore
+4
-1
vendor/gitignore/Global/IPythonNotebook.gitignore
vendor/gitignore/Global/IPythonNotebook.gitignore
+0
-2
vendor/gitignore/Global/JetBrains.gitignore
vendor/gitignore/Global/JetBrains.gitignore
+1
-0
vendor/gitignore/Global/SublimeText.gitignore
vendor/gitignore/Global/SublimeText.gitignore
+3
-0
vendor/gitignore/Global/Vim.gitignore
vendor/gitignore/Global/Vim.gitignore
+4
-2
vendor/gitignore/Global/VisualStudioCode.gitignore
vendor/gitignore/Global/VisualStudioCode.gitignore
+1
-0
vendor/gitignore/Global/Windows.gitignore
vendor/gitignore/Global/Windows.gitignore
+2
-1
vendor/gitignore/Go.gitignore
vendor/gitignore/Go.gitignore
+1
-1
vendor/gitignore/Java.gitignore
vendor/gitignore/Java.gitignore
+3
-0
vendor/gitignore/Laravel.gitignore
vendor/gitignore/Laravel.gitignore
+1
-1
vendor/gitignore/Maven.gitignore
vendor/gitignore/Maven.gitignore
+3
-0
vendor/gitignore/Node.gitignore
vendor/gitignore/Node.gitignore
+4
-0
vendor/gitignore/Perl.gitignore
vendor/gitignore/Perl.gitignore
+26
-12
vendor/gitignore/Python.gitignore
vendor/gitignore/Python.gitignore
+1
-0
vendor/gitignore/Symfony.gitignore
vendor/gitignore/Symfony.gitignore
+1
-4
vendor/gitignore/TeX.gitignore
vendor/gitignore/TeX.gitignore
+18
-4
vendor/gitignore/VisualStudio.gitignore
vendor/gitignore/VisualStudio.gitignore
+2
-3
vendor/gitlab-ci-yml/Docker.gitlab-ci.yml
vendor/gitlab-ci-yml/Docker.gitlab-ci.yml
+3
-2
vendor/gitlab-ci-yml/Elixir.gitlab-ci.yml
vendor/gitlab-ci-yml/Elixir.gitlab-ci.yml
+3
-3
vendor/gitlab-ci-yml/Go.gitlab-ci.yml
vendor/gitlab-ci-yml/Go.gitlab-ci.yml
+37
-0
vendor/gitlab-ci-yml/Gradle.gitlab-ci.yml
vendor/gitlab-ci-yml/Gradle.gitlab-ci.yml
+1
-1
vendor/gitlab-ci-yml/Openshift.gitlab-ci.yml
vendor/gitlab-ci-yml/Openshift.gitlab-ci.yml
+92
-0
vendor/gitlab-ci-yml/autodeploy/OpenShift.gitlab-ci.yml
vendor/gitlab-ci-yml/autodeploy/OpenShift.gitlab-ci.yml
+2
-0
No files found.
vendor/gitignore/Android.gitignore
View file @
4a463039
...
...
@@ -35,6 +35,8 @@ captures/
# Intellij
*.iml
.idea/workspace.xml
.idea/tasks.xml
.idea/gradle.xml
.idea/libraries
# Keystore files
...
...
vendor/gitignore/Autotools.gitignore
View file @
4a463039
# http://www.gnu.org/software/automake
Makefile.in
/ar-lib
/mdate-sh
/py-compile
/test-driver
/ylwrap
# http://www.gnu.org/software/autoconf
...
...
@@ -9,10 +14,20 @@ Makefile.in
/autoscan-*.log
/aclocal.m4
/compile
/config.guess
/config.h.in
/config.sub
/configure
/configure.scan
/depcomp
/install-sh
/missing
/stamp-h1
# https://www.gnu.org/software/libtool/
/ltmain.sh
# http://www.gnu.org/software/texinfo
/texinfo.tex
vendor/gitignore/CMake.gitignore
View file @
4a463039
...
...
@@ -4,4 +4,5 @@ CMakeScripts
Makefile
cmake_install.cmake
install_manifest.txt
compile_commands.json
CTestTestfile.cmake
vendor/gitignore/Clojure.gitignore
deleted
100644 → 0
View file @
4404ea86
pom.xml
pom.xml.asc
*.jar
*.class
/lib/
/classes/
/target/
/checkouts/
.lein-deps-sum
.lein-repl-history
.lein-plugins/
.lein-failures
.nrepl-port
vendor/gitignore/Clojure.gitignore
0 → 120000
View file @
4a463039
Leiningen.gitignore
\ No newline at end of file
vendor/gitignore/CodeIgniter.gitignore
View file @
4a463039
...
...
@@ -4,3 +4,8 @@
*/cache/*
!*/cache/index.html
!*/cache/.htaccess
user_guide_src/build/*
user_guide_src/cilexer/build/*
user_guide_src/cilexer/dist/*
user_guide_src/cilexer/pycilexer.egg-info/*
vendor/gitignore/CommonLisp.gitignore
View file @
4a463039
*.FASL
*.fasl
*.lisp-temp
*.dfsl
*.pfsl
*.d64fsl
*.p64fsl
*.lx64fsl
*.lx32fsl
*.dx64fsl
*.dx32fsl
*.fx64fsl
*.fx32fsl
*.sx64fsl
*.sx32fsl
*.wx64fsl
*.wx32fsl
vendor/gitignore/Coq.gitignore
View file @
4a463039
*.vo
.*.aux
*.a
*.cma
*.cmi
*.cmo
*.cmx
*.cmxa
*.cmxs
*.glob
*.ml.d
*.ml4.d
*.mli.d
*.mllib.d
*.mlpack.d
*.native
*.o
*.v.d
*.vio
*.vo
.coq-native/
.csdp.cache
.lia.cache
.nia.cache
.nlia.cache
.nra.cache
csdp.cache
lia.cache
nia.cache
nlia.cache
nra.cache
vendor/gitignore/Dart.gitignore
View file @
4a463039
# See https://www.dartlang.org/tools/private-files.html
# Files and directories created by pub
.buildlog
# SDK 1.20 and later (no longer creates packages directories)
.packages
.project
.pub/
build/
# Older SDK versions
# (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
...
...
vendor/gitignore/Elisp.gitignore
View file @
4a463039
...
...
@@ -3,3 +3,9 @@
# Packaging
.cask
# Backup files
*~
# Undo-tree save-files
*.~undo-tree
vendor/gitignore/Elixir.gitignore
View file @
4a463039
...
...
@@ -3,3 +3,4 @@
/deps
erl_crash.dump
*.ez
*.beam
vendor/gitignore/Global/Emacs.gitignore
View file @
4a463039
...
...
@@ -39,4 +39,7 @@ flycheck_*.el
/server/
# projectiles files
.projectile
\ No newline at end of file
.projectile
# directory configuration
.dir-locals.el
vendor/gitignore/Global/IPythonNotebook.gitignore
deleted
100644 → 0
View file @
4404ea86
# Temporary data
.ipynb_checkpoints/
vendor/gitignore/Global/JetBrains.gitignore
View file @
4a463039
...
...
@@ -6,6 +6,7 @@
.idea/tasks.xml
# Sensitive or high-churn files:
.idea/dataSources/
.idea/dataSources.ids
.idea/dataSources.xml
.idea/dataSources.local.xml
...
...
vendor/gitignore/Global/SublimeText.gitignore
View file @
4a463039
...
...
@@ -20,6 +20,9 @@ Package Control.ca-bundle
Package Control.system-ca-bundle
Package Control.cache/
Package Control.ca-certs/
Package Control.merged-ca-bundle
Package Control.user-ca-bundle
oscrypto-ca-bundle.crt
bh_unicode_properties.cache
# Sublime-github package stores a github token in this file
...
...
vendor/gitignore/Global/Vim.gitignore
View file @
4a463039
# swap
[._]*.s[a-w][a-z]
[._]s[a-w][a-z]
[._]*.s[a-v][a-z]
[._]*.sw[a-p]
[._]s[a-v][a-z]
[._]sw[a-p]
# session
Session.vim
# temporary
...
...
vendor/gitignore/Global/VisualStudioCode.gitignore
View file @
4a463039
...
...
@@ -2,3 +2,4 @@
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
vendor/gitignore/Global/Windows.gitignore
View file @
4a463039
# Windows
image file cach
es
# Windows
thumbnail cache fil
es
Thumbs.db
ehthumbs.db
ehthumbs_vista.db
# Folder config file
Desktop.ini
...
...
vendor/gitignore/Go.gitignore
View file @
4a463039
...
...
@@ -26,5 +26,5 @@ _testmain.go
# Output of the go coverage tool, specifically when used with LiteIDE
*.out
#
e
xternal packages folder
#
E
xternal packages folder
vendor/
vendor/gitignore/Java.gitignore
View file @
4a463039
*.class
# BlueJ files
*.ctxt
# Mobile Tools for Java (J2ME)
.mtj.tmp/
...
...
vendor/gitignore/Laravel.gitignore
View file @
4a463039
...
...
@@ -6,8 +6,8 @@ bootstrap/compiled.php
app/storage/
# Laravel 5 & Lumen specific
bootstrap/cache/
public/storage
storage/*.key
.env.*.php
.env.php
.env
...
...
vendor/gitignore/Maven.gitignore
View file @
4a463039
...
...
@@ -7,3 +7,6 @@ release.properties
dependency-reduced-pom.xml
buildNumber.properties
.mvn/timing.properties
# Exclude maven wrapper
!/.mvn/wrapper/maven-wrapper.jar
vendor/gitignore/Node.gitignore
View file @
4a463039
...
...
@@ -42,3 +42,7 @@ jspm_packages
# Output of 'npm pack'
*.tgz
# Yarn Integrity file
.yarn-integrity
vendor/gitignore/Perl.gitignore
View file @
4a463039
/blib/
/.build/
_build/
cover_db/
inc/
Build
!Build/
Build.bat
.last_cover_stats
/Makefile
/Makefile.old
/MANIFEST.bak
/META.yml
/META.json
/MYMETA.*
nytprof.out
/pm_to_blib
*.o
*.bs
# Devel::Cover
cover_db/
# Devel::NYTProf
nytprof.out
# Dizt::Zilla
/.build/
# Module::Build
_build/
Build
Build.bat
# Module::Install
inc/
# ExtUitls::MakeMaker
/blib/
/_eumm/
/*.gz
/Makefile
/Makefile.old
/MANIFEST.bak
/pm_to_blib
/*.zip
vendor/gitignore/Python.gitignore
View file @
4a463039
...
...
@@ -20,6 +20,7 @@ lib64/
parts/
sdist/
var/
wheels/
*.egg-info/
.installed.cfg
*.egg
...
...
vendor/gitignore/Symfony.gitignore
View file @
4a463039
...
...
@@ -31,9 +31,6 @@
/web/bundles/
/web/uploads/
# Assets managed by Bower
/web/assets/vendor/
# PHPUnit
/app/phpunit.xml
/phpunit.xml
...
...
@@ -45,4 +42,4 @@
/composer.phar
# Backup entities generated with doctrine:generate:entities command
*/Entity/*~
*
*
/Entity/*~
vendor/gitignore/TeX.gitignore
View file @
4a463039
...
...
@@ -52,12 +52,22 @@ acs-*.bib
# beamer
*.nav
*.pre
*.snm
*.vrb
# changes
*.soc
# cprotect
*.cpt
# elsarticle (documentclass of Elsevier journals)
*.spl
# endnotes
*.ent
# fixme
*.lox
...
...
@@ -123,9 +133,7 @@ acs-*.bib
*.maf
*.mlf
*.mlt
*.mtc
*.mtc[0-9]
*.mtc[1-9][0-9]
*.mtc[0-9]*
# minted
_minted*
...
...
@@ -140,6 +148,9 @@ _minted*
# nomencl
*.nlo
# pax
*.pax
# sagetex
*.sagetex.sage
*.sagetex.py
...
...
@@ -202,5 +213,8 @@ TSWLatexianTemp*
# KBibTeX
*~[0-9]*
# auto folder when using emacs and auctex
# auto folder when using emacs and auctex
/auto/*
# expex forward references with \gathertags
*-tags.tex
vendor/gitignore/VisualStudio.gitignore
View file @
4a463039
...
...
@@ -8,7 +8,6 @@
*.user
*.userosscache
*.sln.docstates
*.vcxproj.filters
# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs
...
...
@@ -43,11 +42,11 @@ TestResult.xml
[Rr]eleasePS/
dlldata.c
#
DNX
#
.NET Core
project.lock.json
project.fragment.lock.json
artifacts/
Properties/launchSettings.json
**/
Properties/launchSettings.json
*_i.c
*_p.c
...
...
vendor/gitlab-ci-yml/Docker.gitlab-ci.yml
View file @
4a463039
...
...
@@ -7,6 +7,7 @@ services:
build
:
stage
:
build
script
:
-
export IMAGE_TAG=$(echo -en $CI_BUILD_REF_NAME | tr -c '[:alnum:]_.-' '-')
-
docker login -u "gitlab-ci-token" -p "$CI_BUILD_TOKEN" $CI_REGISTRY
-
docker build --pull -t "$CI_REGISTRY_IMAGE:$
CI_BUILD_REF_NAME
" .
-
docker push "$CI_REGISTRY_IMAGE:$
CI_BUILD_REF_NAME
"
-
docker build --pull -t "$CI_REGISTRY_IMAGE:$
IMAGE_TAG
" .
-
docker push "$CI_REGISTRY_IMAGE:$
IMAGE_TAG
"
vendor/gitlab-ci-yml/Elixir.gitlab-ci.yml
View file @
4a463039
# This template uses the non default language docker image
# The image already has Hex installed. You might want to consider to use `elixir:latest`
image
:
trenpixster/elixir:latest
image
:
elixir:latest
# Pick zero or more services to be used on all builds.
# Only needed when using a docker container to run your tests in.
...
...
@@ -11,6 +9,8 @@ services:
-
postgres:latest
before_script
:
-
mix local.rebar --force
-
mix local.hex --force
-
mix deps.get
mix
:
...
...
vendor/gitlab-ci-yml/Go.gitlab-ci.yml
0 → 100644
View file @
4a463039
image
:
golang:latest
# The problem is that to be able to use go get, one needs to put
# the repository in the $GOPATH. So for example if your gitlab domain
# is mydomainperso.com, and that your repository is repos/projectname, and
# the default GOPATH being /go, then you'd need to have your
# repository in /go/src/mydomainperso.com/repos/projectname
# Thus, making a symbolic link corrects this.
before_script
:
-
ln -s /builds /go/src/mydomainperso.com
-
cd /go/src/mydomainperso.com/repos/projectname
stages
:
-
test
-
build
format
:
stage
:
test
script
:
# Add here all the dependencies, or use glide/govendor to get
# them automatically.
# - curl https://glide.sh/get | sh
-
go get github.com/alecthomas/kingpin
-
go tool vet -composites=false -shadow=true *.go
-
go test -race $(go list ./... | grep -v /vendor/)
compile
:
stage
:
build
script
:
# Add here all the dependencies, or use glide/govendor/...
# to get them automatically.
-
go get github.com/alecthomas/kingpin
# Better put this in a Makefile
-
go build -race -ldflags "-extldflags '-static'" -o mybinary
artifacts
:
paths
:
-
mybinary
vendor/gitlab-ci-yml/Gradle.gitlab-ci.yml
View file @
4a463039
...
...
@@ -31,4 +31,4 @@ build:
test
:
stage
:
test
script
:
-
./gradlew -g /cache
./
gradle check
-
./gradlew -g /cache
/.
gradle check
vendor/gitlab-ci-yml/Openshift.gitlab-ci.yml
0 → 100644
View file @
4a463039
# This file is a template, and might need editing before it works on your project.
image
:
ayufan/openshift-cli
stages
:
-
test
-
review
-
staging
-
production
variables
:
OPENSHIFT_SERVER
:
openshift.default.svc.cluster.local
# OPENSHIFT_DOMAIN: apps.example.com
# Configure this variable in Secure Variables:
# OPENSHIFT_TOKEN: my.openshift.token
test1
:
stage
:
test
before_script
:
[]
script
:
-
echo run tests
test2
:
stage
:
test
before_script
:
[]
script
:
-
echo run tests
.deploy
:
&deploy
before_script
:
-
oc login "$OPENSHIFT_SERVER" --token="$OPENSHIFT_TOKEN" --insecure-skip-tls-verify
-
oc project "$CI_PROJECT_NAME" 2> /dev/null || oc new-project "$CI_PROJECT_NAME"
script
:
-
"
oc
get
services
$APP
2>
/dev/null
||
oc
new-app
.
--name=$APP
--strategy=docker"
-
"
oc
start-build
$APP
--from-dir=.
--follow
||
sleep
3s
||
oc
start-build
$APP
--from-dir=.
--follow"
-
"
oc
get
routes
$APP
2>
/dev/null
||
oc
expose
service
$APP
--hostname=$APP_HOST"
review
:
<<
:
*deploy
stage
:
review
variables
:
APP
:
$CI_BUILD_REF_NAME
APP_HOST
:
$CI_PROJECT_NAME-$CI_BUILD_REF_NAME.$OPENSHIFT_DOMAIN
environment
:
name
:
review/$CI_BUILD_REF_NAME
url
:
http://$CI_PROJECT_NAME-$CI_BUILD_REF_NAME.$OPENSHIFT_DOMAIN
on_stop
:
stop-review
only
:
-
branches
except
:
-
master
stop-review
:
<<
:
*deploy
stage
:
review
script
:
-
oc delete all -l "app=$APP"
when
:
manual
variables
:
APP
:
$CI_BUILD_REF_NAME
GIT_STRATEGY
:
none
environment
:
name
:
review/$CI_BUILD_REF_NAME
action
:
stop
only
:
-
branches
except
:
-
master
staging
:
<<
:
*deploy
stage
:
staging
variables
:
APP
:
staging
APP_HOST
:
$CI_PROJECT_NAME-staging.$OPENSHIFT_DOMAIN
environment
:
name
:
staging
url
:
http://$CI_PROJECT_NAME-staging.$OPENSHIFT_DOMAIN
only
:
-
master
production
:
<<
:
*deploy
stage
:
production
variables
:
APP
:
production
APP_HOST
:
$CI_PROJECT_NAME.$OPENSHIFT_DOMAIN
when
:
manual
environment
:
name
:
production
url
:
http://$CI_PROJECT_NAME.$OPENSHIFT_DOMAIN
only
:
-
master
vendor/gitlab-ci-yml/autodeploy/OpenShift.gitlab-ci.yml
View file @
4a463039
# Explaination on the scripts:
# https://gitlab.com/gitlab-examples/openshift-deploy/blob/master/README.md
image
:
registry.gitlab.com/gitlab-examples/openshift-deploy
variables
:
...
...
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