Skip to content

Commit 54948d9

Browse files
committed
Merge branch 'V3/develop' into streams-trovo
2 parents d3305c3 + 9186d05 commit 54948d9

File tree

1,346 files changed

+265592
-148588
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,346 files changed

+265592
-148588
lines changed

.git-blame-ignore-revs

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# Since version 2.23 (released in August 2019), git-blame has a feature
2+
# to ignore or bypass certain commits.
3+
#
4+
# This file contains a list of commits that are not likely what you
5+
# are looking for in a blame, such as mass reformatting or renaming.
6+
# You can set this file as a default ignore file for blame by running
7+
# the following command.
8+
#
9+
# $ git config blame.ignoreRevsFile .git-blame-ignore-revs
10+
11+
# [V3] Update code standards (black code format pass) (#1650)
12+
b88b5a2601f56bda985729352d24842f087a8ade
13+
14+
# Black tests and setup.py (#1657)
15+
e01cdbb0912387749d9459e1d934f9ed393a9b51
16+
17+
# Black formatting for generate_strings.py and docs/conf.py (#1658)
18+
1ecaf6f8d5f2af731bec3eb6ad3a9721ab7a2812
19+
20+
# [V3 Travis] Update travis to not skip pipfile lock... (#1678)
21+
# additional black formatting pass to conform to black 18.5b
22+
d3f406a34a5cae6ea63664e76e8e74be43f9949f
23+
24+
# [V3] Update black version and reformat (#1745)
25+
14cc701b25cea385fd0d537cdb6475d341c017c5
26+
27+
# [V3] Clean up some ugly auto-formatted strings (#1753)
28+
622382f42588ac1d8a52bd3e39bf171c89ff0224
29+
30+
# [CI] Improve automated checks (#2702)
31+
16443c8cc0c24cbc5b3dc7de858edb71b9ca6cd3
32+
33+
# Bump black to 20.8b1 (and reformat) (#4371)
34+
85afe19455f91af21a0f603705eeb5d9599b45cc
35+
36+
# Reformat with Black 22.1.0 (#5633)
37+
c69e8d31fdadbe10230ec0ea2ef35402e5c4cf43
38+
39+
# Reformat with Black 2023 formatting changes
40+
226d8d734de43e1d5ea96a528a8e480641604db1

.git_archive_info.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
$Format:%h$
2+
$Format:%(describe:tags=true)$

.gitattributes

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,10 @@
22

33
# binary file excludsions
44
*.png binary
5+
6+
# include commit/tag information in `.git_archive_info.txt` when packing with git-archive
7+
.git_archive_info.txt export-subst
8+
9+
# hide diffs for .po files by default
10+
# https://docs.github.com/en/repositories/working-with-files/managing-files/customizing-how-changed-files-appear-on-github
11+
*.po linguist-generated

.github/CODEOWNERS

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
# Cogs
22
/redbot/cogs/audio/** @aikaterna @PredaaA
3-
/redbot/cogs/downloader/* @jack1142
3+
/redbot/cogs/downloader/* @Jackenmen
44
/redbot/cogs/streams/* @palmtree5
55
/redbot/cogs/mutes/* @TrustyJAID
66

77
# Docs - Install and update guides
8-
/docs/install_guides/** @jack1142
9-
/docs/update_red.rst @jack1142
8+
/docs/install_guides/** @Jackenmen
9+
/docs/update_red.rst @Jackenmen
1010

1111
# Docs - Version guarantees
12-
/docs/version_guarantees.rst @jack1142
12+
/docs/version_guarantees.rst @Jackenmen
1313

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

1717
# Tests
18-
/redbot/pytest/downloader* @jack1142
19-
/tests/cogs/downloader/* @jack1142
18+
/redbot/pytest/downloader* @Jackenmen
19+
/tests/cogs/downloader/* @Jackenmen
2020

2121
# Schemas
22-
/schema/* @jack1142
22+
/schema/* @Jackenmen
2323

2424
# CI
2525
/.travis.yml @Kowlin

0 commit comments

Comments
 (0)