diff options
author | Ruben Davila <rdavila84@gmail.com> | 2017-02-07 00:03:05 -0500 |
---|---|---|
committer | Ruben Davila <rdavila84@gmail.com> | 2017-02-07 00:03:05 -0500 |
commit | 57191b7221f6ee56f03e4808a31bbe6e9d27df3e (patch) | |
tree | 2e822dc1ca7e23363d429dd218f921a39b605360 /vendor | |
parent | 50f5960c72b4ff8b553bb0f7e8f649ac413f6ce0 (diff) | |
download | gitlab-ce-57191b7221f6ee56f03e4808a31bbe6e9d27df3e.tar.gz |
Update .gitignore templatesupdate-gitignore-templates
Diffstat (limited to 'vendor')
24 files changed, 141 insertions, 179 deletions
diff --git a/vendor/gitignore/Android.gitignore b/vendor/gitignore/Android.gitignore index d028d1251ad..a1a65c2d72e 100644 --- a/vendor/gitignore/Android.gitignore +++ b/vendor/gitignore/Android.gitignore @@ -44,3 +44,11 @@ captures/ # External native build folder generated in Android Studio 2.2 and later .externalNativeBuild + +# Google Services (e.g. APIs or Firebase) +google-services.json + +#Freeline +freeline.py +freeline/ +freeline_project_description.json diff --git a/vendor/gitignore/CMake.gitignore b/vendor/gitignore/CMake.gitignore index 27ada0591ec..9ea395f15ee 100644 --- a/vendor/gitignore/CMake.gitignore +++ b/vendor/gitignore/CMake.gitignore @@ -1,6 +1,7 @@ CMakeCache.txt CMakeFiles CMakeScripts +Testing Makefile cmake_install.cmake install_manifest.txt diff --git a/vendor/gitignore/CodeIgniter.gitignore b/vendor/gitignore/CodeIgniter.gitignore index 60571a0c383..bfea17cdc5b 100644 --- a/vendor/gitignore/CodeIgniter.gitignore +++ b/vendor/gitignore/CodeIgniter.gitignore @@ -9,3 +9,9 @@ user_guide_src/build/* user_guide_src/cilexer/build/* user_guide_src/cilexer/dist/* user_guide_src/cilexer/pycilexer.egg-info/* + +#codeigniter 3 +application/logs/* +!application/logs/index.html +!application/logs/.htaccess +/vendor/ diff --git a/vendor/gitignore/Global/JetBrains.gitignore b/vendor/gitignore/Global/JetBrains.gitignore index e375c744b6d..401fee15748 100644 --- a/vendor/gitignore/Global/JetBrains.gitignore +++ b/vendor/gitignore/Global/JetBrains.gitignore @@ -2,24 +2,24 @@ # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 # User-specific stuff: -.idea/workspace.xml -.idea/tasks.xml +.idea/**/workspace.xml +.idea/**/tasks.xml # Sensitive or high-churn files: -.idea/dataSources/ -.idea/dataSources.ids -.idea/dataSources.xml -.idea/dataSources.local.xml -.idea/sqlDataSources.xml -.idea/dynamic.xml -.idea/uiDesigner.xml +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.xml +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml # Gradle: -.idea/gradle.xml -.idea/libraries +.idea/**/gradle.xml +.idea/**/libraries # Mongo Explorer plugin: -.idea/mongoSettings.xml +.idea/**/mongoSettings.xml ## File-based project format: *.iws diff --git a/vendor/gitignore/Global/Matlab.gitignore b/vendor/gitignore/Global/Matlab.gitignore index 32a5ad4c777..09dfde64b5f 100644 --- a/vendor/gitignore/Global/Matlab.gitignore +++ b/vendor/gitignore/Global/Matlab.gitignore @@ -17,3 +17,6 @@ slprj/ # Session info octave-workspace + +# Simulink autosave extension +.autosave diff --git a/vendor/gitignore/Global/Stata.gitignore b/vendor/gitignore/Global/Stata.gitignore new file mode 100644 index 00000000000..07997bb1201 --- /dev/null +++ b/vendor/gitignore/Global/Stata.gitignore @@ -0,0 +1,24 @@ +# .gitignore file for git projects containing Stata files +# Commercial statistical software: http://www.stata.com + +# Stata dataset and output files +*.dta +*.gph +*.log +*.smcl +*.stpr +*.stsem + +# Graphic export files from Stata +# Stata command graph export: http://www.stata.com/manuals14/g-2graphexport.pdf +# +# You may add graphic export files to your .gitignore. However you should be +# aware that this will exclude all image files from this main directory +# and subdirectories. +# *.ps +# *.eps +# *.wmf +# *.emf +# *.pdf +# *.png +# *.tif diff --git a/vendor/gitignore/Go.gitignore b/vendor/gitignore/Go.gitignore index 5e1047c9d78..a1338d68517 100644 --- a/vendor/gitignore/Go.gitignore +++ b/vendor/gitignore/Go.gitignore @@ -1,30 +1,14 @@ -# Compiled Object files, Static and Dynamic libs (Shared Objects) -*.o -*.a +# Binaries for programs and plugins +*.exe +*.dll *.so +*.dylib -# Folders -_obj -_test - -# Architecture specific extensions/prefixes -*.[568vq] -[568vq].out - -*.cgo1.go -*.cgo2.c -_cgo_defun.c -_cgo_gotypes.go -_cgo_export.* - -_testmain.go - -*.exe +# Test binary, build with `go test -c` *.test -*.prof # Output of the go coverage tool, specifically when used with LiteIDE *.out -# External packages folder -vendor/ +# Project-local glide cache, RE: https://github.com/Masterminds/glide/issues/736 +.glide/ diff --git a/vendor/gitignore/Java.gitignore b/vendor/gitignore/Java.gitignore index e44e0860405..dbb4a2dfa1a 100644 --- a/vendor/gitignore/Java.gitignore +++ b/vendor/gitignore/Java.gitignore @@ -1,5 +1,8 @@ *.class +# Log file +*.log + # BlueJ files *.ctxt @@ -10,6 +13,9 @@ *.jar *.war *.ear +*.zip +*.tar.gz +*.rar # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* diff --git a/vendor/gitignore/Joomla.gitignore b/vendor/gitignore/Joomla.gitignore index 93103fdbe77..53a74e74657 100644 --- a/vendor/gitignore/Joomla.gitignore +++ b/vendor/gitignore/Joomla.gitignore @@ -29,8 +29,6 @@ /administrator/components/com_search/* /administrator/components/com_templates/* /administrator/components/com_users/* -/administrator/components/com_weblinks/* -/administrator/components/index.html /administrator/help/* /administrator/includes/* /administrator/language/en-GB/en-GB.com_ajax.ini @@ -41,7 +39,6 @@ /administrator/language/en-GB/en-GB.com_joomlaupdate.sys.ini /administrator/language/en-GB/en-GB.com_postinstall.ini /administrator/language/en-GB/en-GB.com_postinstall.sys.ini -/administrator/language/en-GB/en-GB.com_sitemapjen.sys.ini /administrator/language/en-GB/en-GB.com_tags.ini /administrator/language/en-GB/en-GB.com_tags.sys.ini /administrator/language/en-GB/en-GB.mod_stats_admin.ini @@ -250,15 +247,10 @@ /administrator/language/en-GB/en-GB.plg_user_joomla.sys.ini /administrator/language/en-GB/en-GB.plg_user_profile.ini /administrator/language/en-GB/en-GB.plg_user_profile.sys.ini -/administrator/language/en-GB/en-GB.tpl_bluestork.ini -/administrator/language/en-GB/en-GB.tpl_bluestork.sys.ini /administrator/language/en-GB/en-GB.tpl_hathor.ini /administrator/language/en-GB/en-GB.tpl_hathor.sys.ini /administrator/language/en-GB/en-GB.xml -/administrator/language/en-GB/index.html -/administrator/language/ru-RU/index.html /administrator/language/overrides/* -/administrator/language/index.html /administrator/logs/index.html /administrator/manifests/* /administrator/modules/mod_custom/* @@ -278,12 +270,9 @@ /administrator/modules/mod_unread/* /administrator/modules/mod_version/* /administrator/modules/mod_stats_admin/* -/administrator/modules/index.html -/administrator/templates/bluestork/* /administrator/templates/isis/* /administrator/templates/hathor/* /administrator/templates/system/* -/administrator/templates/index.html /administrator/index.php /cache/* /bin/* @@ -302,7 +291,6 @@ /components/com_newsfeeds/* /components/com_search/* /components/com_users/* -/components/com_weblinks/* /components/com_wrapper/* /components/index.html /images/banners/* @@ -403,7 +391,6 @@ /language/en-GB/en-GB.tpl_beez5.ini /language/en-GB/en-GB.tpl_beez5.sys.ini /language/en-GB/en-GB.xml -/language/en-GB/index.html /language/en-GB/install.xml /language/overrides/* /language/index.html @@ -428,8 +415,6 @@ /libraries/index.html /libraries/import.php /libraries/loader.php -/libraries/platform.php -/logs/* /media/cms/* /media/com_contenthistory/* /media/com_finder/* @@ -472,7 +457,6 @@ /modules/mod_tags_popular/* /modules/mod_tags_similar/* /modules/mod_users_latest/* -/modules/mod_weblinks/* /modules/mod_whosonline/* /modules/mod_wrapper/* /modules/index.html @@ -481,9 +465,7 @@ /plugins/authentication/joomla/* /plugins/authentication/ldap/* /plugins/authentication/cookie/* -/plugins/authentication/index.html /plugins/captcha/recaptcha/* -/plugins/captcha/index.html /plugins/content/emailcloak/* /plugins/content/example/* /plugins/content/finder/* @@ -494,27 +476,21 @@ /plugins/content/pagenavigation/* /plugins/content/vote/* /plugins/content/contact/* -/plugins/content/index.html /plugins/editors/codemirror/* /plugins/editors/none/* /plugins/editors/tinymce/* -/plugins/editors/index.html /plugins/editors-xtd/module/* /plugins/editors-xtd/article/* /plugins/editors-xtd/image/* /plugins/editors-xtd/pagebreak/* /plugins/editors-xtd/readmore/* -/plugins/editors-xtd/index.html /plugins/extension/example/* /plugins/extension/joomla/* -/plugins/extension/index.html -/plugins/finder/index.html /plugins/finder/categories/* /plugins/finder/contacts/* /plugins/finder/content/* /plugins/finder/newsfeeds/* /plugins/finder/tags/* -/plugins/finder/weblinks/* /plugins/installer/* /plugins/quickicon/extensionupdate/* /plugins/quickicon/joomlaupdate/* @@ -547,10 +523,7 @@ /plugins/user/profile/* /plugins/user/index.html /plugins/index.html -/templates/atomic/* /templates/beez3/* -/templates/beez_20/* -/templates/beez5/* /templates/protostar/* /templates/system/* /templates/index.html diff --git a/vendor/gitignore/KiCad.gitignore b/vendor/gitignore/KiCad.gitignore index 606ed1c7b4d..208bc4fc591 100644 --- a/vendor/gitignore/KiCad.gitignore +++ b/vendor/gitignore/KiCad.gitignore @@ -13,7 +13,8 @@ _autosave-* *.net # Autorouter files (exported from Pcbnew) -.dsn +*.dsn +*.ses # Exported BOM files *.xml diff --git a/vendor/gitignore/Laravel.gitignore b/vendor/gitignore/Laravel.gitignore index a2d1564060b..a4854bef534 100644 --- a/vendor/gitignore/Laravel.gitignore +++ b/vendor/gitignore/Laravel.gitignore @@ -1,5 +1,6 @@ vendor/ node_modules/ +npm-debug.log # Laravel 4 specific bootstrap/compiled.php @@ -7,10 +8,13 @@ app/storage/ # Laravel 5 & Lumen specific public/storage +public/hot storage/*.key .env.*.php .env.php .env +Homestead.yaml +Homestead.json # Rocketeer PHP task runner and deployment package. https://github.com/rocketeers/rocketeer .rocketeer/ diff --git a/vendor/gitignore/Magento.gitignore b/vendor/gitignore/Magento.gitignore index 195c9b7a029..b282f5cf547 100644 --- a/vendor/gitignore/Magento.gitignore +++ b/vendor/gitignore/Magento.gitignore @@ -1,104 +1,16 @@ -.htaccess.sample -.modgit/ -.modman/ -app/code/community/Phoenix/Moneybookers/ -app/code/community/Cm/RedisSession/ -app/code/core/ -app/design/adminhtml/default/default/ -app/design/frontend/base/ -app/design/frontend/rwd/ -app/design/frontend/default/blank/ -app/design/frontend/default/default/ -app/design/frontend/default/iphone/ -app/design/frontend/default/modern/ -app/design/frontend/enterprise/default -app/design/install/ -app/etc/modules/Enterprise_* -app/etc/modules/Mage_*.xml -app/etc/modules/Phoenix_Moneybookers.xml -app/etc/modules/Cm_RedisSession.xml -app/etc/applied.patches.list -app/etc/config.xml -app/etc/enterprise.xml -app/etc/local.xml.additional -app/etc/local.xml.template -app/etc/local.xml -app/.htaccess -app/bootstrap.php -app/locale/en_US/ -app/Mage.php -/cron.php -cron.sh -dev/.htaccess -dev/tests/functional/ -downloader/ -errors/ -favicon.ico -/get.php -includes/ -/index.php -index.php.sample -/install.php -js/blank.html -js/calendar/ -js/enterprise/ -js/extjs/ -js/firebug/ -js/flash/ -js/index.php -js/jscolor/ -js/lib/ -js/mage/ -js/prototype/ -js/scriptaculous/ -js/spacer.gif -js/tiny_mce/ -js/varien/ -lib/3Dsecure/ -lib/Apache/ -lib/flex/ -lib/googlecheckout/ -lib/.htaccess -lib/LinLibertineFont/ -lib/Mage/ -lib/PEAR/ -lib/Pelago/ -lib/phpseclib/ -lib/Varien/ -lib/Zend/ -lib/Cm/ -lib/Credis/ -lib/Magento/ -LICENSE_AFL.txt -LICENSE.html -LICENSE.txt -LICENSE_EE* -/mage -media/ -/api.php -nbproject/ -pear -pear/ -php.ini.sample -pkginfo/ -RELEASE_NOTES.txt -shell/.htaccess -shell/abstract.php -shell/compiler.php -shell/indexer.php -shell/log.php -sitemap.xml -skin/adminhtml/default/default/ -skin/adminhtml/default/enterprise -skin/frontend/base/ -skin/frontend/rwd/ -skin/frontend/default/blank/ -skin/frontend/default/blue/ -skin/frontend/default/default/ -skin/frontend/default/french/ -skin/frontend/default/german/ -skin/frontend/default/iphone/ -skin/frontend/default/modern/ -skin/frontend/enterprise -skin/install/ -var/ +#--------------------------# +# Magento Default Files # +#--------------------------# + +/app/etc/local.xml +/media/* +!/media/.htaccess +!/media/customer/.htaccess +!/media/dhl/logo.jpg +!/media/downloadable/.htaccess +!/media/xmlconnect/custom/ok.gif +!/media/xmlconnect/original/ok.gif +!/media/xmlconnect/system/ok.gif +/var/* +!/var/.htaccess +!/var/package/*.xml diff --git a/vendor/gitignore/Node.gitignore b/vendor/gitignore/Node.gitignore index 9a439fcd988..38ac77e405e 100644 --- a/vendor/gitignore/Node.gitignore +++ b/vendor/gitignore/Node.gitignore @@ -21,6 +21,9 @@ coverage # Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) .grunt +# Bower dependency directory (https://bower.io/) +bower_components + # node-waf configuration .lock-wscript @@ -28,8 +31,11 @@ coverage build/Release # Dependency directories -node_modules -jspm_packages +node_modules/ +jspm_packages/ + +# Typescript v1 declaration files +typings/ # Optional npm cache directory .npm @@ -46,3 +52,6 @@ jspm_packages # Yarn Integrity file .yarn-integrity +# dotenv environment variables file +.env + diff --git a/vendor/gitignore/Objective-C.gitignore b/vendor/gitignore/Objective-C.gitignore index 58c51ecaed4..af90c007a3f 100644 --- a/vendor/gitignore/Objective-C.gitignore +++ b/vendor/gitignore/Objective-C.gitignore @@ -19,7 +19,8 @@ xcuserdata/ ## Other *.moved-aside -*.xcuserstate +*.xccheckout +*.xcscmblueprint ## Obj-C/Swift specific *.hmap diff --git a/vendor/gitignore/Perl.gitignore b/vendor/gitignore/Perl.gitignore index d41364ab18e..9bf1537f6ae 100644 --- a/vendor/gitignore/Perl.gitignore +++ b/vendor/gitignore/Perl.gitignore @@ -4,6 +4,7 @@ /META.json /MYMETA.* *.o +*.pm.tdy *.bs # Devel::Cover diff --git a/vendor/gitignore/PureScript.gitignore b/vendor/gitignore/PureScript.gitignore new file mode 100644 index 00000000000..361cf5277ba --- /dev/null +++ b/vendor/gitignore/PureScript.gitignore @@ -0,0 +1,8 @@ +# Dependencies +.psci_modules +bower_components +node_modules + +# Generated files +.psci +output diff --git a/vendor/gitignore/Python.gitignore b/vendor/gitignore/Python.gitignore index 9a05e2debe5..cf3102d6b00 100644 --- a/vendor/gitignore/Python.gitignore +++ b/vendor/gitignore/Python.gitignore @@ -80,7 +80,7 @@ celerybeat-schedule .env # virtualenv -.venv/ +.venv venv/ ENV/ diff --git a/vendor/gitignore/Scala.gitignore b/vendor/gitignore/Scala.gitignore index a02d882cb88..006a7b247fe 100644 --- a/vendor/gitignore/Scala.gitignore +++ b/vendor/gitignore/Scala.gitignore @@ -13,6 +13,8 @@ project/boot/ project/plugins/project/ # Scala-IDE specific +.ensime +.ensime_cache/ .scala_dependencies .worksheet diff --git a/vendor/gitignore/Swift.gitignore b/vendor/gitignore/Swift.gitignore index 2c22487b5e3..099d22ae2f4 100644 --- a/vendor/gitignore/Swift.gitignore +++ b/vendor/gitignore/Swift.gitignore @@ -19,7 +19,8 @@ xcuserdata/ ## Other *.moved-aside -*.xcuserstate +*.xccheckout +*.xcscmblueprint ## Obj-C/Swift specific *.hmap @@ -35,6 +36,7 @@ playground.xcworkspace # # Add this line if you want to avoid checking in source code from Swift Package Manager dependencies. # Packages/ +# Package.pins .build/ # CocoaPods diff --git a/vendor/gitignore/Unity.gitignore b/vendor/gitignore/Unity.gitignore index 1c10388911b..b829399ae85 100644 --- a/vendor/gitignore/Unity.gitignore +++ b/vendor/gitignore/Unity.gitignore @@ -5,6 +5,9 @@ /[Bb]uilds/ /Assets/AssetStoreTools* +# Visual Studio 2015 cache directory +/.vs/ + # Autogenerated VS/MD/Consulo solution and project files ExportedObj/ .consulo/ @@ -18,6 +21,7 @@ ExportedObj/ *.pidb *.booproj *.svd +*.pdb # Unity3D generated meta files diff --git a/vendor/gitignore/UnrealEngine.gitignore b/vendor/gitignore/UnrealEngine.gitignore index beec7b91f15..2f096001fec 100644 --- a/vendor/gitignore/UnrealEngine.gitignore +++ b/vendor/gitignore/UnrealEngine.gitignore @@ -36,6 +36,7 @@ # These project files can be generated by the engine *.xcodeproj +*.xcworkspace *.sln *.suo *.opensdf @@ -56,6 +57,9 @@ Build/* # Don't ignore icon files in Build !Build/**/*.ico +# Built data for maps +*_BuiltData.uasset + # Configuration files generated by the Editor Saved/* diff --git a/vendor/gitignore/VisualStudio.gitignore b/vendor/gitignore/VisualStudio.gitignore index d9e876cfcdd..8054980d742 100644 --- a/vendor/gitignore/VisualStudio.gitignore +++ b/vendor/gitignore/VisualStudio.gitignore @@ -199,7 +199,6 @@ ClientBin/ *.jfm *.pfx *.publishsettings -node_modules/ orleans.codegen.cs # Since there are multiple workflows, uncomment next line to ignore bower_components @@ -234,6 +233,10 @@ FakesAssemblies/ # Node.js Tools for Visual Studio .ntvs_analysis.dat +node_modules/ + +# Typescript v1 declaration files +typings/ # Visual Studio 6 build log *.plg @@ -271,4 +274,5 @@ __pycache__/ *.pyc # Cake - Uncomment if you are using it -# tools/ +# tools/** +# !tools/packages.config diff --git a/vendor/gitignore/Waf.gitignore b/vendor/gitignore/Waf.gitignore index 48e8d8f7be4..dad2b56bdda 100644 --- a/vendor/gitignore/Waf.gitignore +++ b/vendor/gitignore/Waf.gitignore @@ -1,4 +1,9 @@ -# for projects that use Waf for building: http://code.google.com/p/waf/ -.waf-* -.waf3-* -.lock-* +# For projects that use the Waf build system: https://waf.io/ +# Dot-hidden on Unix-like systems +.waf-*-*/ +.waf3-*-*/ +# Hidden directory on Windows (no dot) +waf-*-*/ +waf3-*-*/ +# Lockfile +.lock-waf_*_build diff --git a/vendor/gitlab-ci-yml/autodeploy/Kubernetes.gitlab-ci.yml b/vendor/gitlab-ci-yml/autodeploy/Kubernetes.gitlab-ci.yml index 36dfc539b3b..7298ea73bab 100644 --- a/vendor/gitlab-ci-yml/autodeploy/Kubernetes.gitlab-ci.yml +++ b/vendor/gitlab-ci-yml/autodeploy/Kubernetes.gitlab-ci.yml @@ -1,4 +1,4 @@ -# Explaination on the scripts: +# Explanation on the scripts: # https://gitlab.com/gitlab-examples/kubernetes-deploy/blob/master/README.md image: registry.gitlab.com/gitlab-examples/kubernetes-deploy |