Commit 96ae6099 authored by Z.J. van de Weg's avatar Z.J. van de Weg Committed by Alfredo Sumaran

Run rake gitlab:update_templates

parent 8039856d
...@@ -43,7 +43,7 @@ namespace :gitlab do ...@@ -43,7 +43,7 @@ namespace :gitlab do
), ),
Template.new( Template.new(
"https://gitlab.com/gitlab-org/gitlab-ci-yml.git", "https://gitlab.com/gitlab-org/gitlab-ci-yml.git",
/(\.{1,2}|LICENSE|Pages|\.gitignore)\z/ /(\.{1,2}|LICENSE|Pages|\.gitlab-ci.yml)\z/
)] )]
def vendor_directory def vendor_directory
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
*.apk *.apk
*.ap_ *.ap_
# Files for the Dalvik VM # Files for the ART/Dalvik VM
*.dex *.dex
# Java class files # Java class files
...@@ -34,6 +34,7 @@ captures/ ...@@ -34,6 +34,7 @@ captures/
# Intellij # Intellij
*.iml *.iml
.idea/workspace.xml
# Keystore files # Keystore files
*.jks *.jks
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
# Fortran module files # Fortran module files
*.mod *.mod
*.smod
# Compiled Static libraries # Compiled Static libraries
*.lai *.lai
......
...@@ -4,3 +4,4 @@ CMakeScripts ...@@ -4,3 +4,4 @@ CMakeScripts
Makefile Makefile
cmake_install.cmake cmake_install.cmake
install_manifest.txt install_manifest.txt
CTestTestfile.cmake
...@@ -18,3 +18,7 @@ ...@@ -18,3 +18,7 @@
.dub .dub
docs.json docs.json
__dummy.html __dummy.html
docs/
# Code coverage
*.lst
.DS_Store *.DS_Store
.AppleDouble .AppleDouble
.LSOverride .LSOverride
...@@ -15,6 +15,7 @@ Icon ...@@ -15,6 +15,7 @@ Icon
.TemporaryItems .TemporaryItems
.Trashes .Trashes
.VolumeIcon.icns .VolumeIcon.icns
.com.apple.timemachine.donotpresent
# Directories potentially created on remote AFP share # Directories potentially created on remote AFP share
.AppleDB .AppleDB
......
## Globally Useful gitignores
This directory contains globally useful gitignores,
e.g. OS-specific and editor specific.
For more on global gitignores:
<https://help.github.com/articles/ignoring-files/#create-a-global-gitignore>
And a good blog post about 'em:
<http://augustl.com/blog/2009/global_gitignores>
...@@ -12,3 +12,16 @@ ...@@ -12,3 +12,16 @@
# sftp configuration file # sftp configuration file
sftp-config.json sftp-config.json
# Package control specific files
Package Control.last-run
Package Control.ca-list
Package Control.ca-bundle
Package Control.system-ca-bundle
Package Control.cache/
Package Control.ca-certs/
bh_unicode_properties.cache
# Sublime-github package stores a github token in this file
# https://packagecontrol.io/packages/sublime-github
GitHub.sublime-settings
...@@ -16,3 +16,4 @@ cabal.sandbox.config ...@@ -16,3 +16,4 @@ cabal.sandbox.config
*.hp *.hp
*.eventlog *.eventlog
.stack-work/ .stack-work/
cabal.project.local
*.jl.cov
*.jl.*.cov
*.jl.mem
deps/deps.jl
Copyright (c) 2016 GitHub, Inc.
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
...@@ -7,7 +7,6 @@ app/storage/ ...@@ -7,7 +7,6 @@ app/storage/
# Laravel 5 & Lumen specific # Laravel 5 & Lumen specific
bootstrap/cache/ bootstrap/cache/
storage/
.env.*.php .env.*.php
.env.php .env.php
.env .env
......
...@@ -24,6 +24,8 @@ xcuserdata/ ...@@ -24,6 +24,8 @@ xcuserdata/
## Obj-C/Swift specific ## Obj-C/Swift specific
*.hmap *.hmap
*.ipa *.ipa
*.dSYM.zip
*.dSYM
# CocoaPods # CocoaPods
# #
...@@ -49,3 +51,10 @@ Carthage/Build ...@@ -49,3 +51,10 @@ Carthage/Build
fastlane/report.xml fastlane/report.xml
fastlane/screenshots fastlane/screenshots
#Code Injection
#
# After new code Injection tools there's a generated folder /iOSInjectionProject
# https://github.com/johnno1962/injectionforxcode
iOSInjectionProject/
...@@ -34,5 +34,5 @@ Makefile* ...@@ -34,5 +34,5 @@ Makefile*
*.qmlproject.user.* *.qmlproject.user.*
# QtCtreator CMake # QtCtreator CMake
CMakeLists.txt.user CMakeLists.txt.user*
# .gitignore templates
This directory contains language-specific .gitignore templates that are used by GitLab.
These files were automatically pulled from [this repository](https://github.com/github/gitignore).
Please submit pull requests to that repository. There is no need to edit the files in this directory.
## Bulk Update
To update this directory with the latest changes in the repository, run:
```sh
bundle exec rake gitlab:update_gitignore
```
...@@ -16,6 +16,10 @@ pickle-email-*.html ...@@ -16,6 +16,10 @@ pickle-email-*.html
config/initializers/secret_token.rb config/initializers/secret_token.rb
config/secrets.yml config/secrets.yml
# dotenv
# TODO Comment out this rule if environment variables can be committed
.env
## Environment normalization: ## Environment normalization:
/.bundle /.bundle
/vendor/bundle /vendor/bundle
......
...@@ -24,6 +24,8 @@ xcuserdata/ ...@@ -24,6 +24,8 @@ xcuserdata/
## Obj-C/Swift specific ## Obj-C/Swift specific
*.hmap *.hmap
*.ipa *.ipa
*.dSYM.zip
*.dSYM
## Playgrounds ## Playgrounds
timeline.xctimeline timeline.xctimeline
......
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
*.suo *.suo
*.opensdf *.opensdf
*.sdf *.sdf
*.VC.db
*.VC.opendb *.VC.opendb
# Precompiled Assets # Precompiled Assets
......
...@@ -42,6 +42,7 @@ dlldata.c ...@@ -42,6 +42,7 @@ dlldata.c
# DNX # DNX
project.lock.json project.lock.json
project.fragment.lock.json
artifacts/ artifacts/
*_i.c *_i.c
......
# Official docker image.
image: docker:latest
build:
stage: build
script:
- docker build -t test .
# 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
# Pic zero or more services to be used on all builds.
# Only needed when using a docker container to run your tests in.
# Check out: http://docs.gitlab.com/ce/ci/docker/using_docker_images.html#what-is-service
services:
- mysql:latest
- redis:latest
- postgres:latest
before_script:
- mix deps.get
mix:
script:
- mix test
# Official framework image. Look for the different tagged releases at:
# https://hub.docker.com/r/library/node/tags/
image: node:latest
# Pick zero or more services to be used on all builds.
# Only needed when using a docker container to run your tests in.
# Check out: http://docs.gitlab.com/ce/ci/docker/using_docker_images.html#what-is-service
services:
- mysql:latest
- redis:latest
- postgres:latest
# This folder is cached between builds
# http://docs.gitlab.com/ce/ci/yaml/README.html#cache
cache:
paths:
- node_modules/
test_async:
script:
- npm install
- node ./specs/start.js ./specs/async.spec.js
test_db:
script:
- npm install
- node ./specs/start.js ./specs/db-postgres.spec.js
# Official language image. Look for the different tagged releases at:
# https://hub.docker.com/r/library/ruby/tags/
image: "ruby:2.3"
# Pick zero or more services to be used on all builds.
# Only needed when using a docker container to run your tests in.
# Check out: http://docs.gitlab.com/ce/ci/docker/using_docker_images.html#what-is-service
services:
- mysql:latest
- redis:latest
- postgres:latest
# This is a basic example for a gem or script which doesn't use
# services such as redis or postgres
before_script:
- gem install bundler # Bundler is not installed with the image
- bundle install -j $(nproc) # Install dependencies
rubocop:
script:
- rubocop
rspec:
script:
- rspec spec
rails:
script:
- rake db:migrate
- rspec spec
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment