Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge qa into master for production release #803

Merged
merged 12 commits into from
Aug 22, 2024
+92 −86
Merged

Merge qa into master for production release #803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ae7d28d
Bump google-cloud-storage in /{{cookiecutter.project_slug}} (#786)
dependabot[bot] Aug 2, 2024
27a4eef
Bump django-allauth in /{{cookiecutter.project_slug}} (#780)
dependabot[bot] Aug 5, 2024
1be99fe
Bump google-cloud-secret-manager in /{{cookiecutter.project_slug}} (#…
dependabot[bot] Aug 7, 2024
311f0e5
Merge pull request #792 from crowdbotics/develop
crowdbotics-apps Aug 8, 2024
75093a9
CBDEVOPS-503 fix django release workflow
shashanksinha89 Aug 8, 2024
294bb65
Merge pull request #793 from crowdbotics/CBDEVOPS-503
shashanksinha89 Aug 8, 2024
2c5d472
Merge pull request #794 from crowdbotics/develop
crowdbotics-apps Aug 8, 2024
540fe92
feat(settings.py): add AccountMiddleware to MIDDLEWARE list for bette…
Hesbon5600 Aug 12, 2024
f8cb292
refactor(home/api/v1/serializers.py): replace deprecated email_addres…
Hesbon5600 Aug 12, 2024
8a57158
fix(home/templates): replace deprecated 'staticfiles' tag with 'stati…
Hesbon5600 Aug 13, 2024
b9607d9
Merge pull request #796 from crowdbotics/PI-258-add-allauth-middleware
sgmagar Aug 13, 2024
e0b7cbb
Merge pull request #800 from crowdbotics/develop
crowdbotics-apps Aug 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/create-github-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ jobs:
id: repo-clone
run: |
git clone https://${{ secrets.GIT_TOKEN }}@github.com/crowdbotics/django-scaffold.git

- name: Clone Reusable Actions Repo
run: |
git clone -b master https://${{ secrets.GIT_TOKEN }}@github.com/crowdbotics/github-actions.git

- name: Checkout branch
id: checkout
Expand Down
6 changes: 3 additions & 3 deletions {{cookiecutter.project_slug}}/Pipfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ waitress = "~=2.1.2"
whitenoise = "~=6.7.0"
djangorestframework = "~=3.15.1"
django-bootstrap4 = "~=22.1"
django-allauth = "~=0.54.0"
django-allauth = "~=0.63.6"
django-extensions = "~=3.2.3"
packaging = "*"
pyyaml = "~=6.0"
pillow = "~=10.4.0"
pytest = "==8.3.1"
factory-boy = "==3.3.0"
google-cloud-secret-manager = "==2.20.1"
google-cloud-secret-manager = "==2.20.2"
google-auth = "==2.31.0"
google-cloud-storage = "==2.17.0"
google-cloud-storage = "==2.18.0"
pipenv = "*"
django-import-export = "*"
drf-spectacular = "~=0.26.4"
Expand Down
156 changes: 78 additions & 78 deletions {{cookiecutter.project_slug}}/Pipfile.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions {{cookiecutter.project_slug}}/home/api/v1/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
from django.utils.translation import gettext_lazy as _
from allauth.account import app_settings as allauth_settings
from allauth.account.forms import ResetPasswordForm
from allauth.utils import email_address_exists, generate_unique_username
from allauth.utils import generate_unique_username
from allauth.account.utils import assess_unique_email
from allauth.account.adapter import get_adapter
from allauth.account.utils import setup_user_email
from rest_framework import serializers
Expand Down Expand Up @@ -38,7 +39,7 @@ def _get_request(self):
def validate_email(self, email):
email = get_adapter().clean_email(email)
if allauth_settings.UNIQUE_EMAIL:
if email and email_address_exists(email):
if email and assess_unique_email(email):
raise serializers.ValidationError(
_("A user is already registered with this e-mail address.")
)
Expand Down
2 changes: 1 addition & 1 deletion {{cookiecutter.project_slug}}/home/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% raw %}
{% load staticfiles %}
{% load static %}
<!doctype html>
<html lang="en">
<head>
Expand Down
2 changes: 1 addition & 1 deletion {{cookiecutter.project_slug}}/home/templates/home/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% raw %}
{% extends '../base.html' %}
{% load staticfiles %}
{% load static %}
{% load bootstrap4 %}

{% block content %}
Expand Down
3 changes: 2 additions & 1 deletion {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
'allauth.account.middleware.AccountMiddleware',
]

ROOT_URLCONF = '{{cookiecutter.project_slug}}.urls'
Expand Down Expand Up @@ -284,7 +285,7 @@
EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"


# GCP config
# GCP config
def google_service_account_config():
# base64 encoded service_account.json file
service_account_config = env.str("GS_CREDENTIALS", "")
Expand Down