Merge branch 'update-templates-for-10-0' into 'master'

vendor/Dockerfile/CONTRIBUTING.md

@@ -3,3 +3,50 @@ https://gitlab.com/gitlab-org/Dockerfile.
 
 GitLab only mirrors the templates. Please submit your merge requests to 
 https://gitlab.com/gitlab-org/Dockerfile.
+
+## Contributing
+
+Thank you for your interest in contributing to this GitLab project! We welcome
+all contributions. By participating in this project, you agree to abide by the
+[code of conduct](#code-of-conduct).
+
+## Contributor license agreement
+
+By submitting code as an individual you agree to the [individual contributor
+license agreement][individual-agreement].
+
+By submitting code as an entity you agree to the [corporate contributor license
+agreement][corporate-agreement].
+
+## Code of conduct
+
+As contributors and maintainers of this project, we pledge to respect all people
+who contribute through reporting issues, posting feature requests, updating
+documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free
+experience for everyone, regardless of level of experience, gender, gender
+identity and expression, sexual orientation, disability, personal appearance,
+body size, race, ethnicity, age, or religion.
+
+Examples of unacceptable behavior by participants include the use of sexual
+language or imagery, derogatory comments or personal attacks, trolling, public
+or private harassment, insults, or other unprofessional conduct.
+
+Project maintainers have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct. Project maintainers who do not follow the
+Code of Conduct may be removed from the project team.
+
+This code of conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior can be
+reported by emailing contact@gitlab.com.
+
+This Code of Conduct is adapted from the [Contributor Covenant][contributor-covenant], version 1.1.0,
+available at [http://contributor-covenant.org/version/1/1/0/](http://contributor-covenant.org/version/1/1/0/).
+
+[contributor-covenant]: http://contributor-covenant.org
+[individual-agreement]: https://docs.gitlab.com/ee/legal/individual_contributor_license_agreement.html
+[corporate-agreement]: https://docs.gitlab.com/ee/legal/corporate_contributor_license_agreement.html

vendor/gitignore/Actionscript.gitignore

 # Build and Release Folders
-bin/
 bin-debug/
 bin-release/
-[Oo]bj/ # FlashDevelop obj
-[Bb]in/ # FlashDevelop bin
+[Oo]bj/
+[Bb]in/
 
 # Other files and folders
 .settings/

vendor/gitignore/Drupal.gitignore

 # Ignore configuration files that may contain sensitive information.
 sites/*/*settings*.php
+sites/example.sites.php
 
 # Ignore paths that contain generated content.
 files/
 sites/*/files
 sites/*/private
+sites/*/translations
 
 # Ignore default text files
 robots.txt
@@ -16,6 +18,7 @@ robots.txt
 /UPGRADE.txt
 /README.txt
 sites/README.txt
+sites/all/libraries/README.txt
 sites/all/modules/README.txt
 sites/all/themes/README.txt
 

vendor/gitignore/Kotlin.gitignore

+Java.gitignore
\ No newline at end of file

vendor/gitignore/Nanoc.gitignore

@@ -4,7 +4,7 @@
 output/
 
 # Temporary file directory
-tmp/
+tmp/nanoc/
 
 # Crash Log
 crash.log

vendor/gitignore/Node.gitignore

@@ -29,7 +29,7 @@ bower_components
 # node-waf configuration
 .lock-wscript
 
-# Compiled binary addons (http://nodejs.org/api/addons.html)
+# Compiled binary addons (https://nodejs.org/api/addons.html)
 build/Release
 
 # Dependency directories

vendor/gitignore/Qt.gitignore

@@ -26,6 +26,8 @@ moc_*.cpp
 moc_*.h
 qrc_*.cpp
 ui_*.h
+*.qmlc
+*.jsc
 Makefile*
 *build-*
 

vendor/gitignore/Swift.gitignore

@@ -37,6 +37,7 @@ playground.xcworkspace
 # Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
 # Packages/
 # Package.pins
+# Package.resolved
 .build/
 
 # CocoaPods

vendor/gitignore/Terraform.gitignore

 # Compiled files
 *.tfstate
+*.tfstate.*.backup
 *.tfstate.backup
 
 # Module directory

vendor/gitignore/VisualStudio.gitignore

@@ -116,6 +116,10 @@ _TeamCity*
 # DotCover is a Code Coverage Tool
 *.dotCover
 
+# AxoCover is a Code Coverage Tool
+.axoCover/*
+!.axoCover/settings.json
+
 # Visual Studio code coverage results
 *.coverage
 *.coveragexml

vendor/gitlab-ci-yml/Bash.gitlab-ci.yml

@@ -4,32 +4,32 @@
 image: busybox:latest
 
 before_script:
-   - echo "Before script section"
-   - echo "For example you might run an update here or install a build dependency"
-   - echo "Or perhaps you might print out some debugging details"
+  - echo "Before script section"
+  - echo "For example you might run an update here or install a build dependency"
+  - echo "Or perhaps you might print out some debugging details"
    
 after_script:
   - echo "After script section"
   - echo "For example you might do some cleanup here"
    
 build1:
- stage: build
- script:
-   - echo "Do your build here"
+  stage: build
+  script:
+    - echo "Do your build here"
    
 test1:
- stage: test
- script: 
-   - echo "Do a test here"
-   - echo "For example run a test suite"
+  stage: test
+  script: 
+    - echo "Do a test here"
+    - echo "For example run a test suite"
    
 test2:
- stage: test
- script: 
-   - echo "Do another parallel test here"
-   - echo "For example run a lint test"
+  stage: test
+  script: 
+    - echo "Do another parallel test here"
+    - echo "For example run a lint test"
    
 deploy1:
- stage: deploy
- script:
-   - echo "Do your deploy here"
\ No newline at end of file
+  stage: deploy
+  script:
+    - echo "Do your deploy here"

vendor/gitlab-ci-yml/Packer.gitlab-ci.yml

+image:
+  name: hashicorp/packer:1.0.4
+  entrypoint:
+    - '/usr/bin/env'
+    - 'PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
+
+before_script:
+  - packer --version
+
+stages:
+  - validate
+  - deploy
+
+validate:
+  stage: validate
+  script:
+    - find . -maxdepth 1 -name '*.json' -print0 | xargs -t0n1 packer validate
+
+build:
+  stage: deploy
+  environment: production
+  script:
+    - find . -maxdepth 1 -name '*.json' -print0 | xargs -t0n1 packer build
+  when: manual
+  only:
+    - master

vendor/gitlab-ci-yml/Terraform.gitlab-ci.yml

+# Official image for Hashicorp's Terraform. It uses light image which is Alpine
+# based as it is much lighter.
+#
+# Entrypoint is also needed as image by default set `terraform` binary as an
+# entrypoint.
+image:
+  name: hashicorp/terraform:light
+  entrypoint:
+    - '/usr/bin/env'
+    - 'PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
+
+# Default output file for Terraform plan
+variables:
+  PLAN: plan.tfplan
+
+cache:
+  paths:
+    - .terraform
+
+before_script:
+  - terraform --version
+  - terraform init
+
+stages:
+  - validate
+  - build
+  - deploy
+
+validate:
+  stage: validate
+  script:
+    - terraform validate
+
+plan:
+  stage: build
+  script:
+    - terraform plan -out=$PLAN
+  artifacts:
+    name: plan
+    paths:
+      - $PLAN
+
+# Separate apply job for manual launching Terraform as it can be destructive
+# action.
+apply:
+  stage: deploy
+  environment:
+    name: production
+  script:
+    - terraform apply -input=false $PLAN
+  dependencies:
+    - plan
+  when: manual
+  only:
+    - master