summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2018-06-08 09:43:19 +0100
committerFilipa Lacerda <filipa@gitlab.com>2018-06-08 09:43:19 +0100
commit5095acb62495960cdc57b3ea2f0e5c37f351e376 (patch)
tree192aa22b4e7e6d7e1e0250f31c1e4e28e721ccfc /vendor
parent9d285f1fef0ca66da16b7c0ba42f50071dab73ab (diff)
downloadgitlab-ce-5095acb62495960cdc57b3ea2f0e5c37f351e376.tar.gz
Updates templates for 11.0
Diffstat (limited to 'vendor')
-rw-r--r--vendor/gitignore/Dart.gitignore10
-rw-r--r--vendor/gitignore/Global/JetBrains.gitignore1
-rw-r--r--vendor/gitignore/Node.gitignore6
-rw-r--r--vendor/gitignore/Sass.gitignore2
-rw-r--r--vendor/gitignore/TeX.gitignore4
-rw-r--r--vendor/gitignore/Terraform.gitignore12
-rw-r--r--vendor/gitignore/VisualStudio.gitignore1
-rw-r--r--vendor/gitlab-ci-yml/autodeploy/Kubernetes-with-canary.gitlab-ci.yml87
-rw-r--r--vendor/gitlab-ci-yml/autodeploy/Kubernetes.gitlab-ci.yml74
-rw-r--r--vendor/gitlab-ci-yml/autodeploy/OpenShift.gitlab-ci.yml74
10 files changed, 31 insertions, 240 deletions
diff --git a/vendor/gitignore/Dart.gitignore b/vendor/gitignore/Dart.gitignore
index 7bf00e82cc9..dbef116d224 100644
--- a/vendor/gitignore/Dart.gitignore
+++ b/vendor/gitignore/Dart.gitignore
@@ -3,7 +3,6 @@
# Files and directories created by pub
.dart_tool/
.packages
-.pub/
build/
# If you're building an application, you may want to check-in your pubspec.lock
pubspec.lock
@@ -11,3 +10,12 @@ pubspec.lock
# Directory created by dartdoc
# If you don't generate documentation locally you can remove this line.
doc/api/
+
+# Avoid committing generated Javascript files:
+*.dart.js
+*.info.json # Produced by the --dump-info flag.
+*.js # When generated by dart2js. Don't specify *.js if your
+ # project includes source files written in JavaScript.
+*.js_
+*.js.deps
+*.js.map
diff --git a/vendor/gitignore/Global/JetBrains.gitignore b/vendor/gitignore/Global/JetBrains.gitignore
index b09cb3dbc04..4d5117a1d9d 100644
--- a/vendor/gitignore/Global/JetBrains.gitignore
+++ b/vendor/gitignore/Global/JetBrains.gitignore
@@ -14,6 +14,7 @@
.idea/**/sqlDataSources.xml
.idea/**/dynamic.xml
.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
# Gradle
.idea/**/gradle.xml
diff --git a/vendor/gitignore/Node.gitignore b/vendor/gitignore/Node.gitignore
index ad46b30886f..4454ba1b5bf 100644
--- a/vendor/gitignore/Node.gitignore
+++ b/vendor/gitignore/Node.gitignore
@@ -59,3 +59,9 @@ typings/
# next.js build output
.next
+
+# vuepress build output
+.vuepress/dist
+
+# Serverless directories
+.serverless
diff --git a/vendor/gitignore/Sass.gitignore b/vendor/gitignore/Sass.gitignore
index 486b32ce90c..159f515170b 100644
--- a/vendor/gitignore/Sass.gitignore
+++ b/vendor/gitignore/Sass.gitignore
@@ -1,2 +1,4 @@
.sass-cache/
*.css.map
+*.sass.map
+*.scss.map
diff --git a/vendor/gitignore/TeX.gitignore b/vendor/gitignore/TeX.gitignore
index e6598ba1727..3d12d3f90ad 100644
--- a/vendor/gitignore/TeX.gitignore
+++ b/vendor/gitignore/TeX.gitignore
@@ -40,6 +40,10 @@
*.synctex.gz(busy)
*.pdfsync
+## Build tool directories for auxiliary files
+# latexrun
+latex.out/
+
## Auxiliary and intermediate files from other packages:
# algorithms
*.alg
diff --git a/vendor/gitignore/Terraform.gitignore b/vendor/gitignore/Terraform.gitignore
index 1fef4ab91e1..d9397e2d7d9 100644
--- a/vendor/gitignore/Terraform.gitignore
+++ b/vendor/gitignore/Terraform.gitignore
@@ -1,9 +1,15 @@
-# Local .terraform directories
+# Local .terraform directories
**/.terraform/*
# .tfstate files
*.tfstate
*.tfstate.*
-# .tfvars files
-*.tfvars
+# Crash log files
+crash.log
+
+# Ignore any .tfvars files that are generated automatically for each Terraform run. Most
+# .tfvars files are managed as part of configuration and so should be included in
+# version control.
+#
+# example.tfvars
diff --git a/vendor/gitignore/VisualStudio.gitignore b/vendor/gitignore/VisualStudio.gitignore
index 3e759b75bf4..1e9abf78d69 100644
--- a/vendor/gitignore/VisualStudio.gitignore
+++ b/vendor/gitignore/VisualStudio.gitignore
@@ -52,7 +52,6 @@ BenchmarkDotNet.Artifacts/
project.lock.json
project.fragment.lock.json
artifacts/
-**/Properties/launchSettings.json
# StyleCop
StyleCopReport.xml
diff --git a/vendor/gitlab-ci-yml/autodeploy/Kubernetes-with-canary.gitlab-ci.yml b/vendor/gitlab-ci-yml/autodeploy/Kubernetes-with-canary.gitlab-ci.yml
deleted file mode 100644
index 6e5fe97cf6d..00000000000
--- a/vendor/gitlab-ci-yml/autodeploy/Kubernetes-with-canary.gitlab-ci.yml
+++ /dev/null
@@ -1,87 +0,0 @@
-# This template has been DEPRECATED. Consider using Auto DevOps instead:
-# https://docs.gitlab.com/ee/topics/autodevops
-
-# Explanation on the scripts:
-# https://gitlab.com/gitlab-examples/kubernetes-deploy/blob/master/README.md
-image: registry.gitlab.com/gitlab-examples/kubernetes-deploy
-
-variables:
- # Application deployment domain
- KUBE_DOMAIN: domain.example.com
-
-stages:
- - build
- - test
- - review
- - staging
- - canary
- - production
- - cleanup
-
-build:
- stage: build
- script:
- - command build
- only:
- - branches
-
-canary:
- stage: canary
- script:
- - command canary
- environment:
- name: production
- url: http://$CI_PROJECT_PATH_SLUG.$KUBE_DOMAIN
- when: manual
- only:
- - master
-
-production:
- stage: production
- script:
- - command deploy
- environment:
- name: production
- url: http://$CI_PROJECT_PATH_SLUG.$KUBE_DOMAIN
- when: manual
- only:
- - master
-
-staging:
- stage: staging
- script:
- - command deploy
- environment:
- name: staging
- url: http://$CI_PROJECT_PATH_SLUG-staging.$KUBE_DOMAIN
- only:
- - master
-
-review:
- stage: review
- script:
- - command deploy
- environment:
- name: review/$CI_COMMIT_REF_NAME
- url: http://$CI_PROJECT_PATH_SLUG-$CI_ENVIRONMENT_SLUG.$KUBE_DOMAIN
- on_stop: stop_review
- only:
- - branches
- except:
- - master
-
-stop_review:
- stage: cleanup
- variables:
- GIT_STRATEGY: none
- script:
- - command destroy
- environment:
- name: review/$CI_COMMIT_REF_NAME
- action: stop
- when: manual
- allow_failure: true
- only:
- - branches
- except:
- - master
diff --git a/vendor/gitlab-ci-yml/autodeploy/Kubernetes.gitlab-ci.yml b/vendor/gitlab-ci-yml/autodeploy/Kubernetes.gitlab-ci.yml
deleted file mode 100644
index 019a4d4cd7d..00000000000
--- a/vendor/gitlab-ci-yml/autodeploy/Kubernetes.gitlab-ci.yml
+++ /dev/null
@@ -1,74 +0,0 @@
-# This template has been DEPRECATED. Consider using Auto DevOps instead:
-# https://docs.gitlab.com/ee/topics/autodevops
-
-# Explanation on the scripts:
-# https://gitlab.com/gitlab-examples/kubernetes-deploy/blob/master/README.md
-image: registry.gitlab.com/gitlab-examples/kubernetes-deploy
-
-variables:
- # Application deployment domain
- KUBE_DOMAIN: domain.example.com
-
-stages:
- - build
- - test
- - review
- - staging
- - production
- - cleanup
-
-build:
- stage: build
- script:
- - command build
- only:
- - branches
-
-production:
- stage: production
- script:
- - command deploy
- environment:
- name: production
- url: http://$CI_PROJECT_PATH_SLUG.$KUBE_DOMAIN
- when: manual
- only:
- - master
-
-staging:
- stage: staging
- script:
- - command deploy
- environment:
- name: staging
- url: http://$CI_PROJECT_PATH_SLUG-staging.$KUBE_DOMAIN
- only:
- - master
-
-review:
- stage: review
- script:
- - command deploy
- environment:
- name: review/$CI_COMMIT_REF_NAME
- url: http://$CI_PROJECT_PATH_SLUG-$CI_ENVIRONMENT_SLUG.$KUBE_DOMAIN
- on_stop: stop_review
- only:
- - branches
- except:
- - master
-
-stop_review:
- stage: cleanup
- variables:
- GIT_STRATEGY: none
- script:
- - command destroy
- environment:
- name: review/$CI_COMMIT_REF_NAME
- action: stop
- when: manual
- only:
- - branches
- except:
- - master
diff --git a/vendor/gitlab-ci-yml/autodeploy/OpenShift.gitlab-ci.yml b/vendor/gitlab-ci-yml/autodeploy/OpenShift.gitlab-ci.yml
deleted file mode 100644
index 60a9430a839..00000000000
--- a/vendor/gitlab-ci-yml/autodeploy/OpenShift.gitlab-ci.yml
+++ /dev/null
@@ -1,74 +0,0 @@
-# This template has been DEPRECATED. Consider using Auto DevOps instead:
-# https://docs.gitlab.com/ee/topics/autodevops
-
-# Explanation on the scripts:
-# https://gitlab.com/gitlab-examples/openshift-deploy/blob/master/README.md
-image: registry.gitlab.com/gitlab-examples/openshift-deploy
-
-variables:
- # Application deployment domain
- KUBE_DOMAIN: domain.example.com
-
-stages:
- - build
- - test
- - review
- - staging
- - production
- - cleanup
-
-build:
- stage: build
- script:
- - command build
- only:
- - branches
-
-production:
- stage: production
- script:
- - command deploy
- environment:
- name: production
- url: http://$CI_PROJECT_PATH_SLUG.$KUBE_DOMAIN
- when: manual
- only:
- - master
-
-staging:
- stage: staging
- script:
- - command deploy
- environment:
- name: staging
- url: http://$CI_PROJECT_PATH_SLUG-staging.$KUBE_DOMAIN
- only:
- - master
-
-review:
- stage: review
- script:
- - command deploy
- environment:
- name: review/$CI_COMMIT_REF_NAME
- url: http://$CI_PROJECT_PATH_SLUG-$CI_ENVIRONMENT_SLUG.$KUBE_DOMAIN
- on_stop: stop_review
- only:
- - branches
- except:
- - master
-
-stop_review:
- stage: cleanup
- variables:
- GIT_STRATEGY: none
- script:
- - command destroy
- environment:
- name: review/$CI_COMMIT_REF_NAME
- action: stop
- when: manual
- only:
- - branches
- except:
- - master