Skip to content

Commit

Permalink
Merge branch 'V3/develop' into pr/ansi-colour-support
Browse files Browse the repository at this point in the history
  • Loading branch information
Kreusada authored Dec 24, 2024
2 parents 17036c8 + 1506925 commit b5c8b84
Show file tree
Hide file tree
Showing 1,374 changed files with 252,200 additions and 151,129 deletions.
40 changes: 40 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# Since version 2.23 (released in August 2019), git-blame has a feature
# to ignore or bypass certain commits.
#
# This file contains a list of commits that are not likely what you
# are looking for in a blame, such as mass reformatting or renaming.
# You can set this file as a default ignore file for blame by running
# the following command.
#
# $ git config blame.ignoreRevsFile .git-blame-ignore-revs

# [V3] Update code standards (black code format pass) (#1650)
b88b5a2601f56bda985729352d24842f087a8ade

# Black tests and setup.py (#1657)
e01cdbb0912387749d9459e1d934f9ed393a9b51

# Black formatting for generate_strings.py and docs/conf.py (#1658)
1ecaf6f8d5f2af731bec3eb6ad3a9721ab7a2812

# [V3 Travis] Update travis to not skip pipfile lock... (#1678)
# additional black formatting pass to conform to black 18.5b
d3f406a34a5cae6ea63664e76e8e74be43f9949f

# [V3] Update black version and reformat (#1745)
14cc701b25cea385fd0d537cdb6475d341c017c5

# [V3] Clean up some ugly auto-formatted strings (#1753)
622382f42588ac1d8a52bd3e39bf171c89ff0224

# [CI] Improve automated checks (#2702)
16443c8cc0c24cbc5b3dc7de858edb71b9ca6cd3

# Bump black to 20.8b1 (and reformat) (#4371)
85afe19455f91af21a0f603705eeb5d9599b45cc

# Reformat with Black 22.1.0 (#5633)
c69e8d31fdadbe10230ec0ea2ef35402e5c4cf43

# Reformat with Black 2023 formatting changes
226d8d734de43e1d5ea96a528a8e480641604db1
2 changes: 2 additions & 0 deletions .git_archive_info.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
$Format:%h$
$Format:%(describe:tags=true)$
7 changes: 7 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,10 @@

# binary file excludsions
*.png binary

# include commit/tag information in `.git_archive_info.txt` when packing with git-archive
.git_archive_info.txt export-subst

# hide diffs for .po files by default
# https://docs.github.com/en/repositories/working-with-files/managing-files/customizing-how-changed-files-appear-on-github
*.po linguist-generated
14 changes: 7 additions & 7 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
# Cogs
/redbot/cogs/audio/** @aikaterna @PredaaA
/redbot/cogs/downloader/* @jack1142
/redbot/cogs/downloader/* @Jackenmen
/redbot/cogs/streams/* @palmtree5
/redbot/cogs/mutes/* @TrustyJAID

# Docs - Install and update guides
/docs/install_guides/** @jack1142
/docs/update_red.rst @jack1142
/docs/install_guides/** @Jackenmen
/docs/update_red.rst @Jackenmen

# Docs - Version guarantees
/docs/version_guarantees.rst @jack1142
/docs/version_guarantees.rst @Jackenmen

# Trivia Lists
/redbot/cogs/trivia/data/lists/whosthatpokemon*.yaml @aikaterna

# Tests
/redbot/pytest/downloader* @jack1142
/tests/cogs/downloader/* @jack1142
/redbot/pytest/downloader* @Jackenmen
/tests/cogs/downloader/* @Jackenmen

# Schemas
/schema/* @jack1142
/schema/* @Jackenmen

# CI
/.travis.yml @Kowlin
Expand Down
16 changes: 16 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1 +1,17 @@
### Description of the changes



### Have the changes in this PR been tested?

<!--
Choose one (remove the line that doesn't apply):
-->
Yes
No
<!--
If the question doesn't apply (for example, it's not a code change), choose Yes.
Please respond to this question truthfully. We do not delay nor reject PRs
based on the answer to this question but it allows to better review this PR.
-->
Loading

0 comments on commit b5c8b84

Please sign in to comment.