Skip to content

Commit 555fe60

Browse files
authored
Merge branch 'main' into check_collectstatic
2 parents 42bda2e + 68fa4c1 commit 555fe60

File tree

4 files changed

+22
-6
lines changed

4 files changed

+22
-6
lines changed

.github/CODEOWNERS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Notify @EWDurbin for all opened Issues and Pull Requests
2+
* @EWDurbin @JacobCoffee

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<!--
2+
By submitting this pull request, you agree to:
3+
- follow the [PSF's Code of Conduct](https://www.python.org/psf/conduct/)
4+
-->
5+
#### Description
6+
7+
-
8+
9+
<!--
10+
If applicable, please add in issue numbers this pull request will close, if applicable
11+
Examples: Fixes #4321 or Closes #1234
12+
13+
Ensure you are using a supported keyword to properly link an issue:
14+
https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword
15+
-->
16+
#### Closes
17+
18+
-
19+

base-requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ requests[security]>=2.26.0
3636
django-honeypot==1.0.4 # 1.0.4 is first version that supports Django 4.2
3737
django-markupfield==2.0.1
3838

39-
django-allauth==0.57.2 # 0.55.0 is first version that supports Django 4.2
39+
django-allauth==64.2.1
4040

4141
django-waffle==2.2.1
4242

pydotorg/settings/base.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -230,11 +230,6 @@
230230

231231
'allauth',
232232
'allauth.account',
233-
'allauth.socialaccount',
234-
#'allauth.socialaccount.providers.facebook',
235-
#'allauth.socialaccount.providers.github',
236-
#'allauth.socialaccount.providers.openid',
237-
#'allauth.socialaccount.providers.twitter',
238233

239234
# Tastypie needs the `users` app to be already loaded.
240235
'tastypie',

0 commit comments

Comments
 (0)