From e31b424f1e427590a2144a1528c265326274d99c Mon Sep 17 00:00:00 2001 From: Steve Azzopardi Date: Thu, 8 Nov 2018 09:36:27 +0100 Subject: Run rake gitlab:update_templates As part of step 4 on feature freeze day, we need to update the templates. https://gitlab.com/gitlab-org/release/docs/blob/7a3b6468aed8b254a26c202e98d8476ec3d6c046/general/release-candidates.md#step-4-update-the-gitignore-and-dockerfile-templates-on-gitlab-ce --- vendor/gitignore/Android.gitignore | 4 +- vendor/gitignore/Delphi.gitignore | 3 ++ vendor/gitignore/Elixir.gitignore | 1 + vendor/gitignore/Global/Images.gitignore | 63 +++++++++++++++++++++++ vendor/gitignore/Global/NetBeans.gitignore | 2 +- vendor/gitignore/Global/PSoCCreator.gitignore | 18 +++++++ vendor/gitignore/Global/Xcode.gitignore | 74 +++++++++++++++++++++++---- vendor/gitignore/Laravel.gitignore | 2 +- vendor/gitignore/Magento.gitignore | 2 + vendor/gitignore/Node.gitignore | 3 ++ vendor/gitignore/Python.gitignore | 3 ++ vendor/gitignore/Rails.gitignore | 1 + vendor/gitignore/Unity.gitignore | 1 + 13 files changed, 165 insertions(+), 12 deletions(-) create mode 100644 vendor/gitignore/Global/Images.gitignore create mode 100644 vendor/gitignore/Global/PSoCCreator.gitignore diff --git a/vendor/gitignore/Android.gitignore b/vendor/gitignore/Android.gitignore index 39b6783cef8..69eda01429a 100644 --- a/vendor/gitignore/Android.gitignore +++ b/vendor/gitignore/Android.gitignore @@ -1,6 +1,7 @@ # Built application files *.apk *.ap_ +*.aab # Files for the ART/Dalvik VM *.dex @@ -43,8 +44,9 @@ captures/ .idea/caches # Keystore files -# Uncomment the following line if you do not want to check your keystore files in. +# Uncomment the following lines if you do not want to check your keystore files in. #*.jks +#*.keystore # External native build folder generated in Android Studio 2.2 and later .externalNativeBuild diff --git a/vendor/gitignore/Delphi.gitignore b/vendor/gitignore/Delphi.gitignore index 000ee5f104b..9532800ba22 100644 --- a/vendor/gitignore/Delphi.gitignore +++ b/vendor/gitignore/Delphi.gitignore @@ -64,3 +64,6 @@ __recovery/ # Castalia statistics file (since XE7 Castalia is distributed with Delphi) *.stat + +# Boss dependency manager vendor folder https://github.com/HashLoad/boss +modules/ diff --git a/vendor/gitignore/Elixir.gitignore b/vendor/gitignore/Elixir.gitignore index 86e4c3f3905..b263cd10f37 100644 --- a/vendor/gitignore/Elixir.gitignore +++ b/vendor/gitignore/Elixir.gitignore @@ -7,3 +7,4 @@ erl_crash.dump *.ez *.beam /config/*.secret.exs +.elixir_ls/ diff --git a/vendor/gitignore/Global/Images.gitignore b/vendor/gitignore/Global/Images.gitignore new file mode 100644 index 00000000000..97dcdbe6a95 --- /dev/null +++ b/vendor/gitignore/Global/Images.gitignore @@ -0,0 +1,63 @@ +# JPEG +*.jpg +*.jpeg +*.jpe +*.jif +*.jfif +*.jfi + +# JPEG 2000 +*.jp2 +*.j2k +*.jpf +*.jpx +*.jpm +*.mj2 + +# JPEG XR +*.jxr +*.hdp +*.wdp + +# Graphics Interchange Format +*.gif + +# RAW +*.raw + +# Web P +*.webp + +# Portable Network Graphics +*.png + +# Animated Portable Network Graphics +*.apng + +# Multiple-image Network Graphics +*.mng + +# Tagged Image File Format +*.tiff +*.tif + +# Scalable Vector Graphics +*.svg +*.svgz + +# Portable Document Format +*.pdf + +# X BitMap +*.xbm + +# BMP +*.bmp +*.dib + +# ICO +*.ico + +# 3D Images +*.3dm +*.max diff --git a/vendor/gitignore/Global/NetBeans.gitignore b/vendor/gitignore/Global/NetBeans.gitignore index 254108cd23b..863bc7fa66e 100644 --- a/vendor/gitignore/Global/NetBeans.gitignore +++ b/vendor/gitignore/Global/NetBeans.gitignore @@ -1,4 +1,4 @@ -nbproject/private/ +**/nbproject/private/ build/ nbbuild/ dist/ diff --git a/vendor/gitignore/Global/PSoCCreator.gitignore b/vendor/gitignore/Global/PSoCCreator.gitignore new file mode 100644 index 00000000000..15ae040bcda --- /dev/null +++ b/vendor/gitignore/Global/PSoCCreator.gitignore @@ -0,0 +1,18 @@ +# Project Settings +*.cywrk.* +*.cyprj.* + +# Generated Assets and Resources +Debug/ +Release/ +Export/ +*/codegentemp +*/Generated_Source +*_datasheet.pdf +*_timing.html +*.cycdx +*.cyfit +*.rpt +*.svd +*.log +*.zip diff --git a/vendor/gitignore/Global/Xcode.gitignore b/vendor/gitignore/Global/Xcode.gitignore index cd0c7d3e45a..b01314d3a64 100644 --- a/vendor/gitignore/Global/Xcode.gitignore +++ b/vendor/gitignore/Global/Xcode.gitignore @@ -2,17 +2,11 @@ # # gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore -## User settings -xcuserdata/ - -## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9) -*.xcscmblueprint -*.xccheckout - -## compatibility with Xcode 3 and earlier (ignoring not required starting Xcode 4) +## Build generated build/ DerivedData/ -*.moved-aside + +## Various settings *.pbxuser !default.pbxuser *.mode1v3 @@ -21,3 +15,65 @@ DerivedData/ !default.mode2v3 *.perspectivev3 !default.perspectivev3 +xcuserdata/ + +## Other +*.moved-aside +*.xccheckout +*.xcscmblueprint + +## Obj-C/Swift specific +*.hmap +*.ipa +*.dSYM.zip +*.dSYM + +## Playgrounds +timeline.xctimeline +playground.xcworkspace + +# Swift Package Manager +# +# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies. +# Packages/ +# Package.pins +# Package.resolved +.build/ + +# CocoaPods +# +# We recommend against adding the Pods directory to your .gitignore. However +# you should judge for yourself, the pros and cons are mentioned at: +# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control +# +# Pods/ +# +# Add this line if you want to avoid checking in source code from the Xcode workspace +# *.xcworkspace + +# Carthage +# +# Add this line if you want to avoid checking in source code from Carthage dependencies. +# Carthage/Checkouts + +Carthage/Build + +# fastlane +# +# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the +# screenshots whenever they are needed. +# For more information about the recommended setup visit: +# https://docs.fastlane.tools/best-practices/source-control/#source-control + +fastlane/report.xml +fastlane/Preview.html +fastlane/screenshots/**/*.png +fastlane/test_output + +# Code Injection +# +# After new code Injection tools there's a generated folder /iOSInjectionProject +# https://github.com/johnno1962/injectionforxcode + +iOSInjectionProject/ + diff --git a/vendor/gitignore/Laravel.gitignore b/vendor/gitignore/Laravel.gitignore index 67e2146f2bc..6552ddf8a06 100644 --- a/vendor/gitignore/Laravel.gitignore +++ b/vendor/gitignore/Laravel.gitignore @@ -1,4 +1,4 @@ -vendor/ +/vendor/ node_modules/ npm-debug.log yarn-error.log diff --git a/vendor/gitignore/Magento.gitignore b/vendor/gitignore/Magento.gitignore index 6f1fa223992..abe6d79fedb 100644 --- a/vendor/gitignore/Magento.gitignore +++ b/vendor/gitignore/Magento.gitignore @@ -2,6 +2,8 @@ # Magento Default Files # #--------------------------# +/PATCH_*.sh + /app/etc/local.xml /media/* diff --git a/vendor/gitignore/Node.gitignore b/vendor/gitignore/Node.gitignore index c221276ebae..e1da6ae8ea5 100644 --- a/vendor/gitignore/Node.gitignore +++ b/vendor/gitignore/Node.gitignore @@ -71,3 +71,6 @@ typings/ # Serverless directories .serverless + +# FuseBox cache +.fusebox/ diff --git a/vendor/gitignore/Python.gitignore b/vendor/gitignore/Python.gitignore index 6f7a6d9c3d7..510c73d0fdb 100644 --- a/vendor/gitignore/Python.gitignore +++ b/vendor/gitignore/Python.gitignore @@ -109,3 +109,6 @@ venv.bak/ .mypy_cache/ .dmypy.json dmypy.json + +# Pyre type checker +.pyre/ diff --git a/vendor/gitignore/Rails.gitignore b/vendor/gitignore/Rails.gitignore index 78eb74fdc26..38ba1b5b38c 100644 --- a/vendor/gitignore/Rails.gitignore +++ b/vendor/gitignore/Rails.gitignore @@ -50,6 +50,7 @@ node_modules/ # Ignore precompiled javascript packs /public/packs /public/packs-test +/public/assets # Ignore yarn files /yarn-error.log diff --git a/vendor/gitignore/Unity.gitignore b/vendor/gitignore/Unity.gitignore index 0210746b1a5..833e6d4291c 100644 --- a/vendor/gitignore/Unity.gitignore +++ b/vendor/gitignore/Unity.gitignore @@ -23,6 +23,7 @@ ExportedObj/ *.svd *.pdb *.opendb +*.VC.db # Unity3D generated meta files *.pidb.meta -- cgit v1.2.1