Skip to content
Snippets Groups Projects
Commit 96ae6099 authored by Zeger-Jan van de Weg's avatar Zeger-Jan van de Weg Committed by Alfredo Sumaran
Browse files

Run rake gitlab:update_templates

parent 8039856d
No related branches found
No related tags found
1 merge request!4411GitLab CI Yaml template dropdown
Showing
with 78 additions and 19 deletions
Loading
@@ -43,7 +43,7 @@ namespace :gitlab do
Loading
@@ -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
Loading
Loading
Loading
@@ -2,7 +2,7 @@
Loading
@@ -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
Loading
@@ -34,6 +34,7 @@ captures/
Loading
@@ -34,6 +34,7 @@ captures/
   
# Intellij # Intellij
*.iml *.iml
.idea/workspace.xml
   
# Keystore files # Keystore files
*.jks *.jks
Loading
@@ -15,6 +15,7 @@
Loading
@@ -15,6 +15,7 @@
   
# Fortran module files # Fortran module files
*.mod *.mod
*.smod
   
# Compiled Static libraries # Compiled Static libraries
*.lai *.lai
Loading
Loading
Loading
@@ -4,3 +4,4 @@ CMakeScripts
Loading
@@ -4,3 +4,4 @@ CMakeScripts
Makefile Makefile
cmake_install.cmake cmake_install.cmake
install_manifest.txt install_manifest.txt
CTestTestfile.cmake
Loading
@@ -18,3 +18,7 @@
Loading
@@ -18,3 +18,7 @@
.dub .dub
docs.json docs.json
__dummy.html __dummy.html
docs/
# Code coverage
*.lst
.bzr/
.bzrignore
.DS_Store *.DS_Store
.AppleDouble .AppleDouble
.LSOverride .LSOverride
   
Loading
@@ -15,6 +15,7 @@ Icon
Loading
@@ -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
Loading
Loading
## 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>
Loading
@@ -12,3 +12,16 @@
Loading
@@ -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
Loading
@@ -16,3 +16,4 @@ cabal.sandbox.config
Loading
@@ -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.
Loading
@@ -7,7 +7,6 @@ app/storage/
Loading
@@ -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
Loading
Loading
Loading
@@ -24,6 +24,8 @@ xcuserdata/
Loading
@@ -24,6 +24,8 @@ xcuserdata/
## Obj-C/Swift specific ## Obj-C/Swift specific
*.hmap *.hmap
*.ipa *.ipa
*.dSYM.zip
*.dSYM
   
# CocoaPods # CocoaPods
# #
Loading
@@ -49,3 +51,10 @@ Carthage/Build
Loading
@@ -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/
Loading
@@ -34,5 +34,5 @@ Makefile*
Loading
@@ -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
```
Loading
@@ -16,6 +16,10 @@ pickle-email-*.html
Loading
@@ -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
Loading
Loading
Loading
@@ -24,6 +24,8 @@ xcuserdata/
Loading
@@ -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
Loading
Loading
Loading
@@ -37,6 +37,7 @@
Loading
@@ -37,6 +37,7 @@
*.suo *.suo
*.opensdf *.opensdf
*.sdf *.sdf
*.VC.db
*.VC.opendb *.VC.opendb
   
# Precompiled Assets # Precompiled Assets
Loading
Loading
Loading
@@ -42,6 +42,7 @@ dlldata.c
Loading
@@ -42,6 +42,7 @@ dlldata.c
   
# DNX # DNX
project.lock.json project.lock.json
project.fragment.lock.json
artifacts/ artifacts/
   
*_i.c *_i.c
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment