未验证 提交 4a70ab04 编写于 作者: B Brendan Forster 提交者: GitHub

Merge branch 'master' into master

...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
_TODO_ _TODO_
**Links to documentation supporting these rule changes:** **Links to documentation supporting these rule changes:**
_TODO_ _TODO_
If this is a new template: If this is a new template:
- **Link to application or project’s homepage**: _TODO_ - **Link to application or project’s homepage**: _TODO_
# Build and Release Folders # Build and Release Folders
bin/
bin-debug/ bin-debug/
bin-release/ bin-release/
[Oo]bj/ # FlashDevelop obj [Oo]bj/
[Bb]in/ # FlashDevelop bin [Bb]in/
# Other files and folders # Other files and folders
.settings/ .settings/
......
...@@ -32,16 +32,19 @@ proguard/ ...@@ -32,16 +32,19 @@ proguard/
# Android Studio captures folder # Android Studio captures folder
captures/ captures/
# Intellij # IntelliJ
*.iml *.iml
.idea/workspace.xml .idea/workspace.xml
.idea/tasks.xml .idea/tasks.xml
.idea/gradle.xml .idea/gradle.xml
.idea/assetWizardSettings.xml
.idea/dictionaries .idea/dictionaries
.idea/libraries .idea/libraries
.idea/caches
# Keystore files # Keystore files
*.jks # Uncomment the following line if you do not want to check your keystore files in.
#*.jks
# External native build folder generated in Android Studio 2.2 and later # External native build folder generated in Android Studio 2.2 and later
.externalNativeBuild .externalNativeBuild
...@@ -53,3 +56,10 @@ google-services.json ...@@ -53,3 +56,10 @@ google-services.json
freeline.py freeline.py
freeline/ freeline/
freeline_project_description.json freeline_project_description.json
# fastlane
fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots
fastlane/test_output
fastlane/readme.md
...@@ -31,3 +31,12 @@ Makefile.in ...@@ -31,3 +31,12 @@ Makefile.in
# http://www.gnu.org/software/texinfo # http://www.gnu.org/software/texinfo
/texinfo.tex /texinfo.tex
# http://www.gnu.org/software/m4/
m4/libtool.m4
m4/ltoptions.m4
m4/ltsugar.m4
m4/ltversion.m4
m4/lt~obsolete.m4
autom4te.cache
...@@ -6,17 +6,17 @@ high quality, we request that contributions adhere to the following guidelines. ...@@ -6,17 +6,17 @@ high quality, we request that contributions adhere to the following guidelines.
- **Provide a link to the application or project’s homepage**. Unless it’s - **Provide a link to the application or project’s homepage**. Unless it’s
extremely popular, there’s a chance the maintainers don’t know about or use extremely popular, there’s a chance the maintainers don’t know about or use
the language, framework, editor, app, or project your change applies to. the language, framework, editor, app, or project your change applies to.
- **Provide links to documentation** supporting the change you’re making. - **Provide links to documentation** supporting the change you’re making.
Current, canonical documentation mentioning the files being ignored is best. Current, canonical documentation mentioning the files being ignored is best.
If documentation isn’t available to support your change, do the best you can If documentation isn’t available to support your change, do the best you can
to explain what the files being ignored are for. to explain what the files being ignored are for.
- **Explain why you’re making a change**. Even if it seems self-evident, please - **Explain why you’re making a change**. Even if it seems self-evident, please
take a sentence or two to tell us why your change or addition should happen. take a sentence or two to tell us why your change or addition should happen.
It’s especially helpful to articulate why this change applies to *everyone* It’s especially helpful to articulate why this change applies to *everyone*
who works with the applicable technology, rather than just you or your team. who works with the applicable technology, rather than just you or your team.
- **Please consider the scope of your change**. If your change specific to a - **Please consider the scope of your change**. If your change specific to a
certain language or framework, then make sure the change is made to the certain language or framework, then make sure the change is made to the
template for that language or framework, rather than to the template for an template for that language or framework, rather than to the template for an
......
composer.phar composer.phar
/vendor/ /vendor/
# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file # Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control
# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file # You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
# composer.lock # composer.lock
# See https://www.dartlang.org/tools/private-files.html # See https://www.dartlang.org/guides/libraries/private-files
# Files and directories created by pub # Files and directories created by pub
.dart_tool/
.packages .packages
.pub/
build/ build/
# If you're building an application, you may want to check-in your pubspec.lock # If you're building an application, you may want to check-in your pubspec.lock
pubspec.lock pubspec.lock
...@@ -10,3 +10,12 @@ pubspec.lock ...@@ -10,3 +10,12 @@ pubspec.lock
# Directory created by dartdoc # Directory created by dartdoc
# If you don't generate documentation locally you can remove this line. # If you don't generate documentation locally you can remove this line.
doc/api/ doc/api/
# Avoid committing generated Javascript files:
*.dart.js
*.info.json # Produced by the --dump-info flag.
*.js # When generated by dart2js. Don't specify *.js if your
# project includes source files written in JavaScript.
*.js_
*.js.deps
*.js.map
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
# Deployment Manager configuration file for your project. Added in Delphi XE2. # Deployment Manager configuration file for your project. Added in Delphi XE2.
# Uncomment this if it is not mobile development and you do not use remote debug feature. # Uncomment this if it is not mobile development and you do not use remote debug feature.
#*.deployproj #*.deployproj
# #
# C++ object files produced when C/C++ Output file generation is configured. # C++ object files produced when C/C++ Output file generation is configured.
# Uncomment this if you are not using external objects (zlib library for example). # Uncomment this if you are not using external objects (zlib library for example).
#*.obj #*.obj
......
# Ignore configuration files that may contain sensitive information. # Ignore configuration files that may contain sensitive information.
sites/*/*settings*.php sites/*/*settings*.php
sites/example.sites.php
# Ignore paths that contain generated content. # Ignore paths that contain generated content.
files/ files/
sites/*/files sites/*/files
sites/*/private sites/*/private
sites/*/translations
# Ignore default text files # Ignore default text files
robots.txt robots.txt
...@@ -16,6 +18,7 @@ robots.txt ...@@ -16,6 +18,7 @@ robots.txt
/UPGRADE.txt /UPGRADE.txt
/README.txt /README.txt
sites/README.txt sites/README.txt
sites/all/libraries/README.txt
sites/all/modules/README.txt sites/all/modules/README.txt
sites/all/themes/README.txt sites/all/themes/README.txt
......
...@@ -4,6 +4,9 @@ ...@@ -4,6 +4,9 @@
*.s#? *.s#?
*.b#? *.b#?
*.l#? *.l#?
*.b$?
*.s$?
*.l$?
# Eagle project file # Eagle project file
# It contains a serial number and references to the file structure # It contains a serial number and references to the file structure
...@@ -31,14 +34,19 @@ eagle.epf ...@@ -31,14 +34,19 @@ eagle.epf
*.drl *.drl
*.gpi *.gpi
*.pls *.pls
*.ger
*.gpi
*.xln
*.drd *.drd
*.drd.* *.drd.*
*.s#*
*.b#*
*.info *.info
*.eps *.eps
# file locks introduced since 7.x # file locks introduced since 7.x
*.lck *.lck
/_build /_build
/cover /cover
/deps /deps
/doc
/.fetch
erl_crash.dump erl_crash.dump
*.ez *.ez
*.beam *.beam
/config/*.secret.exs
...@@ -10,3 +10,5 @@ ext/ ...@@ -10,3 +10,5 @@ ext/
modern.json modern.json
modern.jsonp modern.jsonp
resources/sass/.sass-cache/ resources/sass/.sass-cache/
resources/.arch-internal-preview.css
.arch-internal-preview.css
...@@ -23,6 +23,9 @@ local.properties ...@@ -23,6 +23,9 @@ local.properties
# CDT-specific (C/C++ Development Tooling) # CDT-specific (C/C++ Development Tooling)
.cproject .cproject
# CDT- autotools
.autotools
# Java annotation processor (APT) # Java annotation processor (APT)
.factorypath .factorypath
...@@ -44,6 +47,9 @@ local.properties ...@@ -44,6 +47,9 @@ local.properties
# Code Recommenders # Code Recommenders
.recommenders/ .recommenders/
# Annotation Processing
.apt_generated/
# Scala IDE specific (Scala & Java development for Eclipse) # Scala IDE specific (Scala & Java development for Eclipse)
.cache-main .cache-main
.scala_dependencies .scala_dependencies
......
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
# User-specific stuff: # User-specific stuff
.idea/**/workspace.xml .idea/**/workspace.xml
.idea/**/tasks.xml .idea/**/tasks.xml
.idea/dictionaries .idea/**/usage.statistics.xml
.idea/**/dictionaries
.idea/**/shelf
# Sensitive or high-churn files: # Sensitive or high-churn files
.idea/**/dataSources/ .idea/**/dataSources/
.idea/**/dataSources.ids .idea/**/dataSources.ids
.idea/**/dataSources.xml
.idea/**/dataSources.local.xml .idea/**/dataSources.local.xml
.idea/**/sqlDataSources.xml .idea/**/sqlDataSources.xml
.idea/**/dynamic.xml .idea/**/dynamic.xml
.idea/**/uiDesigner.xml .idea/**/uiDesigner.xml
.idea/**/dbnavigator.xml
# Gradle: # Gradle
.idea/**/gradle.xml .idea/**/gradle.xml
.idea/**/libraries .idea/**/libraries
# CMake # CMake
cmake-build-*/ cmake-build-*/
# Mongo Explorer plugin: # Mongo Explorer plugin
.idea/**/mongoSettings.xml .idea/**/mongoSettings.xml
## File-based project format: # File-based project format
*.iws *.iws
## Plugin-specific files:
# IntelliJ # IntelliJ
out/ out/
...@@ -47,3 +47,6 @@ com_crashlytics_export_strings.xml ...@@ -47,3 +47,6 @@ com_crashlytics_export_strings.xml
crashlytics.properties crashlytics.properties
crashlytics-build.properties crashlytics-build.properties
fabric.properties fabric.properties
# Editor-based Rest Client
.idea/httpRequests
##---------------------------------------------------
## Remove autosaves generated by the Matlab editor
## We have git for backups!
##---------------------------------------------------
# Windows default autosave extension # Windows default autosave extension
*.asv *.asv
...@@ -12,11 +7,22 @@ ...@@ -12,11 +7,22 @@
# Compiled MEX binaries (all platforms) # Compiled MEX binaries (all platforms)
*.mex* *.mex*
# Simulink Code Generation # Packaged app and toolbox files
*.mlappinstall
*.mltbx
# Generated helpsearch folders
helpsearch*/
# Simulink code generation folders
slprj/ slprj/
sccprj/
# Session info # Matlab code generation folders
octave-workspace codegen/
# Simulink autosave extension # Simulink autosave extension
.autosave *.autosave
# Octave session info
octave-workspace
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
*.evcd *.evcd
*.fsdb *.fsdb
# Default name of the simulation executable. A different name can be # Default name of the simulation executable. A different name can be
# specified with this switch (the associated daidir database name is # specified with this switch (the associated daidir database name is
# also taken from here): -o <path>/<filename> # also taken from here): -o <path>/<filename>
simv simv
...@@ -13,7 +13,7 @@ simv ...@@ -13,7 +13,7 @@ simv
simv.daidir/ simv.daidir/
simv.db.dir/ simv.db.dir/
# Infrastructure necessary to co-simulate SystemC models with # Infrastructure necessary to co-simulate SystemC models with
# Verilog/VHDL models. An alternate directory may be specified with this # Verilog/VHDL models. An alternate directory may be specified with this
# switch: -Mdir=<directory_path> # switch: -Mdir=<directory_path>
csrc/ csrc/
...@@ -22,7 +22,7 @@ csrc/ ...@@ -22,7 +22,7 @@ csrc/
# used to write all messages from simulation: -l <filename> # used to write all messages from simulation: -l <filename>
*.log *.log
# Coverage results (generated with urg) and database location. The # Coverage results (generated with urg) and database location. The
# following switch can also be used: urg -dir <coverage_directory>.vdb # following switch can also be used: urg -dir <coverage_directory>.vdb
simv.vdb/ simv.vdb/
urgReport/ urgReport/
......
# Swap # Swap
[._]*.s[a-v][a-z] [._]*.s[a-v][a-z]
[._]*.sw[a-p] [._]*.sw[a-p]
[._]s[a-v][a-z] [._]s[a-rt-v][a-z]
[._]ss[a-gi-z]
[._]sw[a-p] [._]sw[a-p]
# Session # Session
...@@ -12,3 +13,5 @@ Session.vim ...@@ -12,3 +13,5 @@ Session.vim
*~ *~
# Auto-generated tag files # Auto-generated tag files
tags tags
# Persistent undo
[._]*.un~
...@@ -7,7 +7,7 @@ ehthumbs_vista.db ...@@ -7,7 +7,7 @@ ehthumbs_vista.db
*.stackdump *.stackdump
# Folder config file # Folder config file
Desktop.ini [Dd]esktop.ini
# Recycle Bin used on file shares # Recycle Bin used on file shares
$RECYCLE.BIN/ $RECYCLE.BIN/
...@@ -15,6 +15,7 @@ $RECYCLE.BIN/ ...@@ -15,6 +15,7 @@ $RECYCLE.BIN/
# Windows Installer files # Windows Installer files
*.cab *.cab
*.msi *.msi
*.msix
*.msm *.msm
*.msp *.msp
......
...@@ -2,11 +2,17 @@ ...@@ -2,11 +2,17 @@
# #
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore # 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/ build/
DerivedData/ DerivedData/
*.moved-aside
## Various settings
*.pbxuser *.pbxuser
!default.pbxuser !default.pbxuser
*.mode1v3 *.mode1v3
...@@ -15,9 +21,3 @@ DerivedData/ ...@@ -15,9 +21,3 @@ DerivedData/
!default.mode2v3 !default.mode2v3
*.perspectivev3 *.perspectivev3
!default.perspectivev3 !default.perspectivev3
xcuserdata/
## Other
*.moved-aside
*.xccheckout
*.xcscmblueprint
# General # General
*.DS_Store .DS_Store
.AppleDouble .AppleDouble
.LSOverride .LSOverride
......
# Binaries for programs and plugins # Binaries for programs and plugins
*.exe *.exe
*.exe~
*.dll *.dll
*.so *.so
*.dylib *.dylib
...@@ -9,6 +10,3 @@ ...@@ -9,6 +10,3 @@
# Output of the go coverage tool, specifically when used with LiteIDE # Output of the go coverage tool, specifically when used with LiteIDE
*.out *.out
# Project-local glide cache, RE: https://github.com/Masterminds/glide/issues/736
.glide/
# Godot-specific ignores
.import/
export.cfg
export_presets.cfg
# Mono-specific ignores
.mono/
...@@ -17,5 +17,6 @@ cabal.sandbox.config ...@@ -17,5 +17,6 @@ cabal.sandbox.config
*.eventlog *.eventlog
.stack-work/ .stack-work/
cabal.project.local cabal.project.local
cabal.project.local~
.HTF/ .HTF/
.ghc.environment.* .ghc.environment.*
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
# Package Files # # Package Files #
*.jar *.jar
*.war *.war
*.nar
*.ear *.ear
*.zip *.zip
*.tar.gz *.tar.gz
......
_site/ _site/
.sass-cache/ .sass-cache/
.jekyll-cache/
.jekyll-metadata .jekyll-metadata
/.gitignore
/.htaccess /.htaccess
/administrator/cache/* /administrator/cache/*
/administrator/components/com_admin/* /administrator/components/com_admin/*
...@@ -251,7 +250,7 @@ ...@@ -251,7 +250,7 @@
/administrator/language/en-GB/en-GB.tpl_hathor.sys.ini /administrator/language/en-GB/en-GB.tpl_hathor.sys.ini
/administrator/language/en-GB/en-GB.xml /administrator/language/en-GB/en-GB.xml
/administrator/language/overrides/* /administrator/language/overrides/*
/administrator/logs/index.html /administrator/logs/*
/administrator/manifests/* /administrator/manifests/*
/administrator/modules/mod_custom/* /administrator/modules/mod_custom/*
/administrator/modules/mod_feed/* /administrator/modules/mod_feed/*
......
# For PCBs designed using KiCad: http://www.kicad-pcb.org/ # For PCBs designed using KiCad: http://www.kicad-pcb.org/
# Format documentation: http://kicad-pcb.org/help/file-formats/
# Temporary files # Temporary files
*.000 *.000
...@@ -8,6 +9,10 @@ ...@@ -8,6 +9,10 @@
*~ *~
_autosave-* _autosave-*
*.tmp *.tmp
*-cache.lib
*-rescue.lib
*-save.pro
*-save.kicad_pcb
# Netlist files (exported from Eeschema) # Netlist files (exported from Eeschema)
*.net *.net
......
Java.gitignore
\ No newline at end of file
...@@ -14,3 +14,4 @@ ...@@ -14,3 +14,4 @@
# Metadata # Metadata
*.aliases *.aliases
*.lvlps *.lvlps
.cache/
...@@ -11,3 +11,4 @@ pom.xml.asc ...@@ -11,3 +11,4 @@ pom.xml.asc
.lein-plugins/ .lein-plugins/
.lein-failures .lein-failures
.nrepl-port .nrepl-port
.cpcache/
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
output/ output/
# Temporary file directory # Temporary file directory
tmp/ tmp/nanoc/
# Crash Log # Crash Log
crash.log crash.log
...@@ -29,14 +29,14 @@ bower_components ...@@ -29,14 +29,14 @@ bower_components
# node-waf configuration # node-waf configuration
.lock-wscript .lock-wscript
# Compiled binary addons (http://nodejs.org/api/addons.html) # Compiled binary addons (https://nodejs.org/api/addons.html)
build/Release build/Release
# Dependency directories # Dependency directories
node_modules/ node_modules/
jspm_packages/ jspm_packages/
# Typescript v1 declaration files # TypeScript v1 declaration files
typings/ typings/
# Optional npm cache directory # Optional npm cache directory
...@@ -57,3 +57,17 @@ typings/ ...@@ -57,3 +57,17 @@ typings/
# dotenv environment variables file # dotenv environment variables file
.env .env
# parcel-bundler cache (https://parceljs.org/)
.cache
# next.js build output
.next
# nuxt.js build output
.nuxt
# vuepress build output
.vuepress/dist
# Serverless directories
.serverless
...@@ -18,3 +18,6 @@ _build/ ...@@ -18,3 +18,6 @@ _build/
# oasis generated files # oasis generated files
setup.data setup.data
setup.log setup.log
# Merlin configuring file for Vim and Emacs
.merlin
...@@ -52,7 +52,7 @@ Carthage/Build ...@@ -52,7 +52,7 @@ Carthage/Build
fastlane/report.xml fastlane/report.xml
fastlane/Preview.html fastlane/Preview.html
fastlane/screenshots fastlane/screenshots/**/*.png
fastlane/test_output fastlane/test_output
# Code Injection # Code Injection
......
...@@ -24,7 +24,7 @@ Build.bat ...@@ -24,7 +24,7 @@ Build.bat
# Module::Install # Module::Install
inc/ inc/
# ExtUitls::MakeMaker # ExtUtils::MakeMaker
/blib/ /blib/
/_eumm/ /_eumm/
/*.gz /*.gz
......
...@@ -23,6 +23,7 @@ wheels/ ...@@ -23,6 +23,7 @@ wheels/
*.egg-info/ *.egg-info/
.installed.cfg .installed.cfg
*.egg *.egg
MANIFEST
# PyInstaller # PyInstaller
# Usually these files are written by a python script from a template # Usually these files are written by a python script from a template
...@@ -44,6 +45,7 @@ nosetests.xml ...@@ -44,6 +45,7 @@ nosetests.xml
coverage.xml coverage.xml
*.cover *.cover
.hypothesis/ .hypothesis/
.pytest_cache/
# Translations # Translations
*.mo *.mo
...@@ -52,6 +54,7 @@ coverage.xml ...@@ -52,6 +54,7 @@ coverage.xml
# Django stuff: # Django stuff:
*.log *.log
local_settings.py local_settings.py
db.sqlite3
# Flask stuff: # Flask stuff:
instance/ instance/
...@@ -84,6 +87,8 @@ celerybeat-schedule ...@@ -84,6 +87,8 @@ celerybeat-schedule
env/ env/
venv/ venv/
ENV/ ENV/
env.bak/
venv.bak/
# Spyder project settings # Spyder project settings
.spyderproject .spyderproject
......
# C++ objects and libs # C++ objects and libs
*.slo *.slo
*.lo *.lo
*.o *.o
...@@ -11,7 +10,6 @@ ...@@ -11,7 +10,6 @@
*.dylib *.dylib
# Qt-es # Qt-es
object_script.*.Release object_script.*.Release
object_script.*.Debug object_script.*.Debug
*_plugin_import.cpp *_plugin_import.cpp
...@@ -26,22 +24,20 @@ moc_*.cpp ...@@ -26,22 +24,20 @@ moc_*.cpp
moc_*.h moc_*.h
qrc_*.cpp qrc_*.cpp
ui_*.h ui_*.h
*.qmlc
*.jsc
Makefile* Makefile*
*build-* *build-*
# Qt unit tests # Qt unit tests
target_wrapper.* target_wrapper.*
# QtCreator # QtCreator
*.autosave *.autosave
# QtCtreator Qml # QtCreator Qml
*.qmlproject.user *.qmlproject.user
*.qmlproject.user.* *.qmlproject.user.*
# QtCtreator CMake # QtCreator CMake
CMakeLists.txt.user* CMakeLists.txt.user*
...@@ -31,3 +31,6 @@ vignettes/*.pdf ...@@ -31,3 +31,6 @@ vignettes/*.pdf
# Temporary files created by R markdown # Temporary files created by R markdown
*.utf8.md *.utf8.md
*.knit.md *.knit.md
# Shiny token, see https://shiny.rstudio.com/articles/shinyapps.html
rsconnect/
...@@ -13,7 +13,7 @@ the following resources are a great place to start: ...@@ -13,7 +13,7 @@ the following resources are a great place to start:
[man]: http://git-scm.com/docs/gitignore [man]: http://git-scm.com/docs/gitignore
[help]: https://help.github.com/articles/ignoring-files [help]: https://help.github.com/articles/ignoring-files
[chapter]: http://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository#Ignoring-Files [chapter]: https://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository#_ignoring
[progit]: http://git-scm.com/book [progit]: http://git-scm.com/book
## Folder structure ## Folder structure
...@@ -25,7 +25,7 @@ Global (operating system or editor specific) templates should go into the ...@@ -25,7 +25,7 @@ Global (operating system or editor specific) templates should go into the
## Contributing guidelines ## Contributing guidelines
We’d love you to help us improve this project. To help us keep this collection We’d love for you to help us improve this project. To help us keep this collection
high quality, we request that contributions adhere to the following guidelines. high quality, we request that contributions adhere to the following guidelines.
- **Provide a link to the application or project’s homepage**. Unless it’s - **Provide a link to the application or project’s homepage**. Unless it’s
...@@ -42,7 +42,7 @@ high quality, we request that contributions adhere to the following guidelines. ...@@ -42,7 +42,7 @@ high quality, we request that contributions adhere to the following guidelines.
It’s especially helpful to articulate why this change applies to *everyone* It’s especially helpful to articulate why this change applies to *everyone*
who works with the applicable technology, rather than just you or your team. who works with the applicable technology, rather than just you or your team.
- **Please consider the scope of your change**. If your change specific to a - **Please consider the scope of your change**. If your change is specific to a
certain language or framework, then make sure the change is made to the certain language or framework, then make sure the change is made to the
template for that language or framework, rather than to the template for an template for that language or framework, rather than to the template for an
editor, tool, or operating system. editor, tool, or operating system.
......
devel/
logs/
build/ build/
bin/ bin/
lib/ lib/
...@@ -11,6 +13,8 @@ msg/*Feedback.msg ...@@ -11,6 +13,8 @@ msg/*Feedback.msg
msg/*Goal.msg msg/*Goal.msg
msg/*Result.msg msg/*Result.msg
msg/_*.py msg/_*.py
build_isolated/
devel_isolated/
# Generated by dynamic reconfigure # Generated by dynamic reconfigure
*.cfgc *.cfgc
......
...@@ -14,6 +14,7 @@ pickle-email-*.html ...@@ -14,6 +14,7 @@ pickle-email-*.html
# TODO Comment out this rule if you are OK with secrets being uploaded to the repo # TODO Comment out this rule if you are OK with secrets being uploaded to the repo
config/initializers/secret_token.rb config/initializers/secret_token.rb
config/master.key
# Only include if you have production secrets in this file, which is no longer a Rails default # Only include if you have production secrets in this file, which is no longer a Rails default
# config/secrets.yml # config/secrets.yml
...@@ -42,3 +43,7 @@ bower.json ...@@ -42,3 +43,7 @@ bower.json
# Ignore Byebug command history file. # Ignore Byebug command history file.
.byebug_history .byebug_history
# Ignore node_modules
node_modules/
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
/target/ /target/
# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries # Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
# More information here http://doc.crates.io/guide.html#cargotoml-vs-cargolock # More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
Cargo.lock Cargo.lock
# These are backup files generated by rustfmt # These are backup files generated by rustfmt
......
.sass-cache/ .sass-cache/
*.css.map *.css.map
*.sass.map
*.scss.map
...@@ -13,6 +13,10 @@ SqueakDebug.log ...@@ -13,6 +13,10 @@ SqueakDebug.log
# Monticello package cache # Monticello package cache
/package-cache /package-cache
# playground cache
/play-cache
/play-stash
# Metacello-github cache # Metacello-github cache
/github-cache /github-cache
github-*.zip github-*.zip
...@@ -37,6 +37,7 @@ playground.xcworkspace ...@@ -37,6 +37,7 @@ playground.xcworkspace
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies. # Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
# Packages/ # Packages/
# Package.pins # Package.pins
# Package.resolved
.build/ .build/
# CocoaPods # CocoaPods
...@@ -63,5 +64,5 @@ Carthage/Build ...@@ -63,5 +64,5 @@ Carthage/Build
fastlane/report.xml fastlane/report.xml
fastlane/Preview.html fastlane/Preview.html
fastlane/screenshots fastlane/screenshots/**/*.png
fastlane/test_output fastlane/test_output
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
/bin/* /bin/*
!bin/console !bin/console
!bin/symfony_requirements !bin/symfony_requirements
/vendor/
# Assets and user uploads # Assets and user uploads
/web/bundles/ /web/bundles/
...@@ -37,5 +38,11 @@ ...@@ -37,5 +38,11 @@
# Build data # Build data
/build/ /build/
# Composer PHAR
/composer.phar
# Backup entities generated with doctrine:generate:entities command # Backup entities generated with doctrine:generate:entities command
**/Entity/*~ **/Entity/*~
# Embedded web-server pid file
/.web-server-pid
...@@ -10,9 +10,11 @@ ...@@ -10,9 +10,11 @@
*.fot *.fot
*.cb *.cb
*.cb2 *.cb2
.*.lb
## Intermediate documents: ## Intermediate documents:
*.dvi *.dvi
*.xdv
*-converted-to.* *-converted-to.*
# these rules might exclude image files for figures etc. # these rules might exclude image files for figures etc.
# *.ps # *.ps
...@@ -38,6 +40,10 @@ ...@@ -38,6 +40,10 @@
*.synctex.gz(busy) *.synctex.gz(busy)
*.pdfsync *.pdfsync
## Build tool directories for auxiliary files
# latexrun
latex.out/
## Auxiliary and intermediate files from other packages: ## Auxiliary and intermediate files from other packages:
# algorithms # algorithms
*.alg *.alg
...@@ -108,6 +114,14 @@ acs-*.bib ...@@ -108,6 +114,14 @@ acs-*.bib
*.gaux *.gaux
*.gtex *.gtex
# htlatex
*.4ct
*.4tc
*.idv
*.lg
*.trc
*.xref
# hyperref # hyperref
*.brf *.brf
...@@ -143,7 +157,9 @@ _minted* ...@@ -143,7 +157,9 @@ _minted*
*.mw *.mw
# nomencl # nomencl
*.nlg
*.nlo *.nlo
*.nls
# pax # pax
*.pax *.pax
...@@ -186,6 +202,9 @@ pythontex-files-*/ ...@@ -186,6 +202,9 @@ pythontex-files-*/
# easy-todo # easy-todo
*.lod *.lod
# xmpincl
*.xmpi
# xindy # xindy
*.xdy *.xdy
...@@ -214,7 +233,14 @@ TSWLatexianTemp* ...@@ -214,7 +233,14 @@ TSWLatexianTemp*
*~[0-9]* *~[0-9]*
# auto folder when using emacs and auctex # auto folder when using emacs and auctex
/auto/* ./auto/*
*.el
# expex forward references with \gathertags # expex forward references with \gathertags
*-tags.tex *-tags.tex
# standalone packages
*.sta
# generated if using elsarticle.cls
*.spl
# Compiled files # Local .terraform directories
**/.terraform/*
# .tfstate files
*.tfstate *.tfstate
*.tfstate.backup *.tfstate.*
# Crash log files
crash.log
# Module directory # Ignore any .tfvars files that are generated automatically for each Terraform run. Most
.terraform/ # .tfvars files are managed as part of configuration and so should be included in
# version control.
#
# example.tfvars
## Ignore Umbraco files/folders generated for each instance
##
## Get latest from https://github.com/github/gitignore/blob/master/Umbraco.gitignore
# Note: VisualStudio gitignore rules may also be relevant # Note: VisualStudio gitignore rules may also be relevant
# Umbraco # Umbraco
...@@ -12,8 +16,11 @@ ...@@ -12,8 +16,11 @@
# Don't ignore Umbraco packages (VisualStudio.gitignore mistakes this for a NuGet packages folder) # Don't ignore Umbraco packages (VisualStudio.gitignore mistakes this for a NuGet packages folder)
# Make sure to include details from VisualStudio.gitignore BEFORE this # Make sure to include details from VisualStudio.gitignore BEFORE this
!**/App_Data/[Pp]ackages/ !**/App_Data/[Pp]ackages/*
!**/[Uu]mbraco/[Dd]eveloper/[Pp]ackages !**/[Uu]mbraco/[Dd]eveloper/[Pp]ackages/*
# ImageProcessor DiskCache # ImageProcessor DiskCache
**/App_Data/cache/ **/App_Data/cache/
# Ignore the Models Builder models out of date flag
**/App_Data/Models/ood.flag
/[Ll]ibrary/ [Ll]ibrary/
/[Tt]emp/ [Tt]emp/
/[Oo]bj/ [Oo]bj/
/[Bb]uild/ [Bb]uild/
/[Bb]uilds/ [Bb]uilds/
/Assets/AssetStoreTools* Assets/AssetStoreTools*
# Visual Studio 2015 cache directory # Visual Studio cache directory
/.vs/ .vs/
# Autogenerated VS/MD/Consulo solution and project files # Autogenerated VS/MD/Consulo solution and project files
ExportedObj/ ExportedObj/
...@@ -22,9 +22,11 @@ ExportedObj/ ...@@ -22,9 +22,11 @@ ExportedObj/
*.booproj *.booproj
*.svd *.svd
*.pdb *.pdb
*.opendb
# Unity3D generated meta files # Unity3D generated meta files
*.pidb.meta *.pidb.meta
*.pdb.meta
# Unity3D Generated File On Crash Reports # Unity3D Generated File On Crash Reports
sysinfo.txt sysinfo.txt
......
...@@ -50,6 +50,7 @@ SourceArt/**/*.tga ...@@ -50,6 +50,7 @@ SourceArt/**/*.tga
# Binary Files # Binary Files
Binaries/* Binaries/*
Plugins/*/Binaries/*
# Builds # Builds
Build/* Build/*
...@@ -70,6 +71,7 @@ Saved/* ...@@ -70,6 +71,7 @@ Saved/*
# Compiled source files for the engine to use # Compiled source files for the engine to use
Intermediate/* Intermediate/*
Plugins/*/Intermediate/*
# Cache files for the editor to use # Cache files for the editor to use
DerivedDataCache/* DerivedDataCache/*
...@@ -24,11 +24,14 @@ bld/ ...@@ -24,11 +24,14 @@ bld/
[Oo]bj/ [Oo]bj/
[Ll]og/ [Ll]og/
# Visual Studio 2015 cache/options directory # Visual Studio 2015/2017 cache/options directory
.vs/ .vs/
# Uncomment if you have tasks that create the project's static files in wwwroot # Uncomment if you have tasks that create the project's static files in wwwroot
#wwwroot/ #wwwroot/
# Visual Studio 2017 auto generated files
Generated\ Files/
# MSTest test Results # MSTest test Results
[Tt]est[Rr]esult*/ [Tt]est[Rr]esult*/
[Bb]uild[Ll]og.* [Bb]uild[Ll]og.*
...@@ -49,16 +52,21 @@ BenchmarkDotNet.Artifacts/ ...@@ -49,16 +52,21 @@ BenchmarkDotNet.Artifacts/
project.lock.json project.lock.json
project.fragment.lock.json project.fragment.lock.json
artifacts/ artifacts/
**/Properties/launchSettings.json
# StyleCop
StyleCopReport.xml
# Files built by Visual Studio
*_i.c *_i.c
*_p.c *_p.c
*_i.h *_i.h
*.ilk *.ilk
*.meta *.meta
*.obj *.obj
*.iobj
*.pch *.pch
*.pdb *.pdb
*.ipdb
*.pgc *.pgc
*.pgd *.pgd
*.rsp *.rsp
...@@ -96,6 +104,9 @@ ipch/ ...@@ -96,6 +104,9 @@ ipch/
*.vspx *.vspx
*.sap *.sap
# Visual Studio Trace Files
*.e2e
# TFS 2012 Local Workspace # TFS 2012 Local Workspace
$tf/ $tf/
...@@ -116,6 +127,10 @@ _TeamCity* ...@@ -116,6 +127,10 @@ _TeamCity*
# DotCover is a Code Coverage Tool # DotCover is a Code Coverage Tool
*.dotCover *.dotCover
# AxoCover is a Code Coverage Tool
.axoCover/*
!.axoCover/settings.json
# Visual Studio code coverage results # Visual Studio code coverage results
*.coverage *.coverage
*.coveragexml *.coveragexml
...@@ -151,7 +166,7 @@ publish/ ...@@ -151,7 +166,7 @@ publish/
# Publish Web Output # Publish Web Output
*.[Pp]ublish.xml *.[Pp]ublish.xml
*.azurePubxml *.azurePubxml
# TODO: Comment the next line if you want to checkin your web deploy settings # Note: Comment the next line if you want to checkin your web deploy settings,
# but database connection strings (with potential passwords) will be unencrypted # but database connection strings (with potential passwords) will be unencrypted
*.pubxml *.pubxml
*.publishproj *.publishproj
...@@ -164,11 +179,11 @@ PublishScripts/ ...@@ -164,11 +179,11 @@ PublishScripts/
# NuGet Packages # NuGet Packages
*.nupkg *.nupkg
# The packages folder can be ignored because of Package Restore # The packages folder can be ignored because of Package Restore
**/packages/* **/[Pp]ackages/*
# except build/, which is used as an MSBuild target. # except build/, which is used as an MSBuild target.
!**/packages/build/ !**/[Pp]ackages/build/
# Uncomment if necessary however generally it will be regenerated when needed # Uncomment if necessary however generally it will be regenerated when needed
#!**/packages/repositories.config #!**/[Pp]ackages/repositories.config
# NuGet v3's project.json files produces more ignorable files # NuGet v3's project.json files produces more ignorable files
*.nuget.props *.nuget.props
*.nuget.targets *.nuget.targets
...@@ -205,6 +220,10 @@ ClientBin/ ...@@ -205,6 +220,10 @@ ClientBin/
*.publishsettings *.publishsettings
orleans.codegen.cs orleans.codegen.cs
# Including strong name files can present a security risk
# (https://github.com/github/gitignore/pull/2483#issue-259490424)
#*.snk
# Since there are multiple workflows, uncomment next line to ignore bower_components # Since there are multiple workflows, uncomment next line to ignore bower_components
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) # (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
#bower_components/ #bower_components/
...@@ -219,6 +238,8 @@ _UpgradeReport_Files/ ...@@ -219,6 +238,8 @@ _UpgradeReport_Files/
Backup*/ Backup*/
UpgradeLog*.XML UpgradeLog*.XML
UpgradeLog*.htm UpgradeLog*.htm
ServiceFabricBackup/
*.rptproj.bak
# SQL Server files # SQL Server files
*.mdf *.mdf
...@@ -229,6 +250,7 @@ UpgradeLog*.htm ...@@ -229,6 +250,7 @@ UpgradeLog*.htm
*.rdl.data *.rdl.data
*.bim.layout *.bim.layout
*.bim_*.settings *.bim_*.settings
*.rptproj.rsuser
# Microsoft Fakes # Microsoft Fakes
FakesAssemblies/ FakesAssemblies/
...@@ -240,9 +262,6 @@ FakesAssemblies/ ...@@ -240,9 +262,6 @@ FakesAssemblies/
.ntvs_analysis.dat .ntvs_analysis.dat
node_modules/ node_modules/
# Typescript v1 declaration files
typings/
# Visual Studio 6 build log # Visual Studio 6 build log
*.plg *.plg
...@@ -293,3 +312,18 @@ __pycache__/ ...@@ -293,3 +312,18 @@ __pycache__/
*.btm.cs *.btm.cs
*.odx.cs *.odx.cs
*.xsd.cs *.xsd.cs
# OpenCover UI analysis results
OpenCover/
# Azure Stream Analytics local run output
ASALocalRun/
# MSBuild Binary and Structured Log
*.binlog
# NVidia Nsight GPU debugger configuration file
*.nvuser
# MFractors (Xamarin productivity tool) working folder
.mfractor/
...@@ -7,6 +7,7 @@ wp-content/blogs.dir/ ...@@ -7,6 +7,7 @@ wp-content/blogs.dir/
wp-content/cache/ wp-content/cache/
wp-content/upgrade/ wp-content/upgrade/
wp-content/uploads/ wp-content/uploads/
wp-content/mu-plugins/
wp-content/wp-cache-config.php wp-content/wp-cache-config.php
wp-content/plugins/hello.php wp-content/plugins/hello.php
......
...@@ -19,7 +19,6 @@ temp/ ...@@ -19,7 +19,6 @@ temp/
data/DoctrineORMModule/Proxy/ data/DoctrineORMModule/Proxy/
data/DoctrineORMModule/cache/ data/DoctrineORMModule/cache/
# Legacy ZF1 # Legacy ZF1
demos/ demos/
extras/documentation extras/documentation
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册