From 6b925ece397e35970afe917ba6911d1fa15e48fb Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Mon, 1 Mar 2021 17:29:18 +0100 Subject: [PATCH 1/2] Add `.editorconfig` and `.gitattributes` files for automatic settings This smoothens the contribtor experience by automatically configuring editors that support EditorConfig. The `.gitattributes` file ensures that all files use LF line endings when committed to Git. --- .editorconfig | 19 +++++++++++++++++++ .gitattributes | 3 +++ 2 files changed, 22 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000000..7614d1b1b9b --- /dev/null +++ b/.editorconfig @@ -0,0 +1,19 @@ +root = true + +[*] +charset = utf-8 +end_of_line = lf +indent_style = space +indent_size = 4 +insert_final_newline = true +trim_trailing_whitespace = true + +# YAML requires indentation with spaces instead of tabs. +[*.{js,yml,yaml}] +indent_style = space +indent_size = 2 + +# Makefile requires tab indentation. +[Makefile] +indent_style = tab +indent_size = 4 diff --git a/.gitattributes b/.gitattributes index 4631c3bd3b8..bd70af630ce 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,5 @@ # Properly detect languages on GitHub *.rst linguist-detectable=true + +# Normalize EOL for all files that Git considers text files +* text=auto eol=lf From 61e024212d5ea3263c965df4f48db08a4d3430d7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Aug 2021 04:07:06 +0000 Subject: [PATCH 2/2] Bump sphinx-tabs from 1.1.13 to 3.2.0 Bumps [sphinx-tabs](https://github.com/executablebooks/sphinx-tabs) from 1.1.13 to 3.2.0. - [Release notes](https://github.com/executablebooks/sphinx-tabs/releases) - [Changelog](https://github.com/executablebooks/sphinx-tabs/blob/master/CHANGELOG.md) - [Commits](https://github.com/executablebooks/sphinx-tabs/compare/v1.1.13...v3.2.0) --- updated-dependencies: - dependency-name: sphinx-tabs dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 82ea0fb0921..5a3367ad8b9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,7 @@ sphinx==1.8.5 # pyup: <2.0.0 sphinx_rtd_theme==0.4.3 # Code tabs extension for GDScript/C# -sphinx-tabs==1.1.13 +sphinx-tabs==3.2.0 # Custom 404 error page (more useful than the default) sphinx-notfound-page==0.6