diff options
author | Alex Hanselka <alex@gitlab.com> | 2018-12-10 13:18:46 -0800 |
---|---|---|
committer | Alex Hanselka <alex@gitlab.com> | 2018-12-10 13:18:46 -0800 |
commit | bc1b5ff3afd55e83d2b80a6e97e7440ad15bd33f (patch) | |
tree | 8eda6aaa0ef72394d9332e8077f6af53d32a98f0 /vendor | |
parent | bea8e0626ddd18ad9a2059c65e9005632fb48921 (diff) | |
download | gitlab-ce-bc1b5ff3afd55e83d2b80a6e97e7440ad15bd33f.tar.gz |
Update the .gitignore
Diffstat (limited to 'vendor')
-rw-r--r-- | vendor/gitignore/CMake.gitignore | 1 | ||||
-rw-r--r-- | vendor/gitignore/Drupal.gitignore | 77 | ||||
-rw-r--r-- | vendor/gitignore/Global/Emacs.gitignore | 4 | ||||
-rw-r--r-- | vendor/gitignore/Global/PuTTY.gitignore | 2 | ||||
-rw-r--r-- | vendor/gitignore/Global/Virtuoso.gitignore | 18 | ||||
-rw-r--r-- | vendor/gitignore/Global/Xcode.gitignore | 74 | ||||
-rw-r--r-- | vendor/gitignore/Node.gitignore | 5 | ||||
-rw-r--r-- | vendor/gitignore/Python.gitignore | 1 | ||||
-rw-r--r-- | vendor/gitignore/Smalltalk.gitignore | 9 | ||||
-rw-r--r-- | vendor/gitignore/TeX.gitignore | 4 | ||||
-rw-r--r-- | vendor/gitignore/Unity.gitignore | 4 | ||||
-rw-r--r-- | vendor/gitignore/VisualStudio.gitignore | 4 |
12 files changed, 102 insertions, 101 deletions
diff --git a/vendor/gitignore/CMake.gitignore b/vendor/gitignore/CMake.gitignore index 9ea395f15ee..7e25564f9ec 100644 --- a/vendor/gitignore/CMake.gitignore +++ b/vendor/gitignore/CMake.gitignore @@ -1,3 +1,4 @@ +CMakeLists.txt.user CMakeCache.txt CMakeFiles CMakeScripts diff --git a/vendor/gitignore/Drupal.gitignore b/vendor/gitignore/Drupal.gitignore index 072b683190f..50d3eef8a33 100644 --- a/vendor/gitignore/Drupal.gitignore +++ b/vendor/gitignore/Drupal.gitignore @@ -1,39 +1,46 @@ -# Ignore configuration files that may contain sensitive information. -sites/*/*settings*.php -sites/example.sites.php +# gitignore template for Drupal 8 projects +# +# earlier versions of Drupal are tracked in `community/Python/` -# Ignore paths that contain generated content. -files/ -sites/*/files -sites/*/private -sites/*/translations +# Ignore configuration files that may contain sensitive information +/sites/*/*settings*.php +/sites/*/*services*.yml -# Ignore default text files -robots.txt -/CHANGELOG.txt -/COPYRIGHT.txt -/INSTALL*.txt +# Ignore paths that may contain user-generated content +/sites/*/files +/sites/*/public +/sites/*/private +/sites/*/files-public +/sites/*/files-private + +# Ignore paths that may contain temporary files +/sites/*/translations +/sites/*/tmp +/sites/*/cache + +# Ignore drupal core (if not versioning drupal sources) +/core +/modules/README.txt +/profiles/README.txt +/sites/README.txt +/sites/example.sites.php +/sites/example.settings.local.php +/sites/development.services.yml +/themes/README.txt +/vendor +/.csslintrc +/.editorconfig +/.eslintignore +/.eslintrc.json +/.gitattributes +/.htaccess +/autoload.php +/composer.json +/composer.lock +/example.gitignore +/index.php /LICENSE.txt -/MAINTAINERS.txt -/UPGRADE.txt /README.txt -sites/README.txt -sites/all/libraries/README.txt -sites/all/modules/README.txt -sites/all/themes/README.txt - -# Ignore everything but the "sites" folder ( for non core developer ) -.htaccess -web.config -authorize.php -cron.php -index.php -install.php -update.php -xmlrpc.php -/includes -/misc -/modules -/profiles -/scripts -/themes +/robots.txt +/update.php +/web.config diff --git a/vendor/gitignore/Global/Emacs.gitignore b/vendor/gitignore/Global/Emacs.gitignore index 3ac7904dcd2..d40e86599b5 100644 --- a/vendor/gitignore/Global/Emacs.gitignore +++ b/vendor/gitignore/Global/Emacs.gitignore @@ -43,3 +43,7 @@ flycheck_*.el # directory configuration .dir-locals.el + +# network security +/network-security.data + diff --git a/vendor/gitignore/Global/PuTTY.gitignore b/vendor/gitignore/Global/PuTTY.gitignore new file mode 100644 index 00000000000..c37466b1c79 --- /dev/null +++ b/vendor/gitignore/Global/PuTTY.gitignore @@ -0,0 +1,2 @@ +# Private key +*.ppk diff --git a/vendor/gitignore/Global/Virtuoso.gitignore b/vendor/gitignore/Global/Virtuoso.gitignore new file mode 100644 index 00000000000..2de03673a6c --- /dev/null +++ b/vendor/gitignore/Global/Virtuoso.gitignore @@ -0,0 +1,18 @@ +# Gitignore for Cadence Virtuoso +################################################################ + +# Log files +*.log +panic*.log.* + +# OpenAccess database lock files +*.cdslck* + +# Run directories for layout vs. schematic and design rule check +lvsRunDir/* +drcRunDir/* + +# Abstract generation tool +abstract.log* +abstract.record* + diff --git a/vendor/gitignore/Global/Xcode.gitignore b/vendor/gitignore/Global/Xcode.gitignore index b01314d3a64..cd0c7d3e45a 100644 --- a/vendor/gitignore/Global/Xcode.gitignore +++ b/vendor/gitignore/Global/Xcode.gitignore @@ -2,11 +2,17 @@ # # gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore -## Build generated +## 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/ DerivedData/ - -## Various settings +*.moved-aside *.pbxuser !default.pbxuser *.mode1v3 @@ -15,65 +21,3 @@ 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/Node.gitignore b/vendor/gitignore/Node.gitignore index e1da6ae8ea5..ebfe43954dc 100644 --- a/vendor/gitignore/Node.gitignore +++ b/vendor/gitignore/Node.gitignore @@ -70,7 +70,10 @@ typings/ .vuepress/dist # Serverless directories -.serverless +.serverless/ # FuseBox cache .fusebox/ + +#DynamoDB Local files +.dynamodb/ diff --git a/vendor/gitignore/Python.gitignore b/vendor/gitignore/Python.gitignore index 510c73d0fdb..11614af2870 100644 --- a/vendor/gitignore/Python.gitignore +++ b/vendor/gitignore/Python.gitignore @@ -20,6 +20,7 @@ parts/ sdist/ var/ wheels/ +share/python-wheels/ *.egg-info/ .installed.cfg *.egg diff --git a/vendor/gitignore/Smalltalk.gitignore b/vendor/gitignore/Smalltalk.gitignore index 943995e1172..178d87af45b 100644 --- a/vendor/gitignore/Smalltalk.gitignore +++ b/vendor/gitignore/Smalltalk.gitignore @@ -1,8 +1,11 @@ # changes file *.changes +*.chg # system image *.image +*.img7 +*.img # Pharo Smalltalk Debug log file PharoDebug.log @@ -10,6 +13,12 @@ PharoDebug.log # Squeak Smalltalk Debug log file SqueakDebug.log +# Dolphin Smalltalk source file +*.sml + +# Dolphin Smalltalk error file +*.errors + # Monticello package cache /package-cache diff --git a/vendor/gitignore/TeX.gitignore b/vendor/gitignore/TeX.gitignore index 753f2b954ff..edd1f60b726 100644 --- a/vendor/gitignore/TeX.gitignore +++ b/vendor/gitignore/TeX.gitignore @@ -205,6 +205,10 @@ pythontex-files-*/ # todonotes *.tdo +# vhistory +*.hst +*.ver + # easy-todo *.lod diff --git a/vendor/gitignore/Unity.gitignore b/vendor/gitignore/Unity.gitignore index 833e6d4291c..93c9ce52191 100644 --- a/vendor/gitignore/Unity.gitignore +++ b/vendor/gitignore/Unity.gitignore @@ -35,3 +35,7 @@ sysinfo.txt # Builds *.apk *.unitypackage + +# Crashlytics generated file +Assets/StreamingAssets/crashlytics-build.properties + diff --git a/vendor/gitignore/VisualStudio.gitignore b/vendor/gitignore/VisualStudio.gitignore index 4d13c54854e..4ba92b04afb 100644 --- a/vendor/gitignore/VisualStudio.gitignore +++ b/vendor/gitignore/VisualStudio.gitignore @@ -20,6 +20,8 @@ [Rr]eleases/ x64/ x86/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ bld/ [Bb]in/ [Oo]bj/ @@ -229,6 +231,8 @@ orleans.codegen.cs # Since there are multiple workflows, uncomment next line to ignore bower_components # (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) #bower_components/ +# ASP.NET Core default setup: bower directory is configured as wwwroot/lib/ and bower restore is true +**/wwwroot/lib/ # RIA/Silverlight projects Generated_Code/ |