From 4fadbef8cd9aded59b02d376f78533947aa831df Mon Sep 17 00:00:00 2001 From: Hassan Abouelela <47495861+HassanAbouelela@users.noreply.github.com> Date: Mon, 8 Mar 2021 17:28:17 +0300 Subject: Fixes Production URL Constant Signed-off-by: Hassan Abouelela <47495861+HassanAbouelela@users.noreply.github.com> --- backend/constants.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/constants.py b/backend/constants.py index 4bb7fd1..d90fd9a 100644 --- a/backend/constants.py +++ b/backend/constants.py @@ -13,7 +13,7 @@ MONGO_DATABASE = os.getenv("MONGO_DATABASE", "pydis_forms") SNEKBOX_URL = os.getenv("SNEKBOX_URL", "http://snekbox.default.svc.cluster.local/eval") PRODUCTION = os.getenv("PRODUCTION", "True").lower() != "false" -PRODUCTION_URL = "https://forms.pythondiscord.com/" +PRODUCTION_URL = "https://forms.pythondiscord.com" OAUTH2_CLIENT_ID = os.getenv("OAUTH2_CLIENT_ID") OAUTH2_CLIENT_SECRET = os.getenv("OAUTH2_CLIENT_SECRET") -- cgit v1.2.3 From 90ce6c0f9741b79293f877e586490009d3f5c213 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Mar 2021 06:53:04 +0000 Subject: Bump deepmerge from 0.1.1 to 0.2.1 Bumps [deepmerge](https://github.com/toumorokoshi/deepmerge) from 0.1.1 to 0.2.1. - [Release notes](https://github.com/toumorokoshi/deepmerge/releases) - [Commits](https://github.com/toumorokoshi/deepmerge/compare/v0.1.1...v0.2.1) Signed-off-by: dependabot[bot] --- poetry.lock | 8 ++++---- pyproject.toml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/poetry.lock b/poetry.lock index 4940b36..00b87b8 100644 --- a/poetry.lock +++ b/poetry.lock @@ -24,7 +24,7 @@ python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" [[package]] name = "deepmerge" -version = "0.1.1" +version = "0.2.1" description = "a toolset to deeply merge python dictionaries." category = "main" optional = false @@ -385,7 +385,7 @@ python-versions = ">=3.6.1" [metadata] lock-version = "1.1" python-versions = "^3.9" -content-hash = "eff5ef112799e98ea12825a2f732eb50eefb4d1d0f7ee074181599ce696786d0" +content-hash = "8c1d8b6baf25a4b5c68c1d11557d9c84b361c3ed090e1c8fe5e9f7656d35bdae" [metadata.files] certifi = [ @@ -401,8 +401,8 @@ colorama = [ {file = "colorama-0.4.4.tar.gz", hash = "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b"}, ] deepmerge = [ - {file = "deepmerge-0.1.1-py2.py3-none-any.whl", hash = "sha256:190e133a6657303db37f9bb302aa853d8d2b15a0e055d41b99a362598e79206a"}, - {file = "deepmerge-0.1.1.tar.gz", hash = "sha256:fa1d44269786bcc12d30a7471b0b39478aa37a43703b134d7f12649792f92c1f"}, + {file = "deepmerge-0.2.1-py2.py3-none-any.whl", hash = "sha256:8270901f85fbe249686236cb18bf4bccc69775da2c2e1fa35de3714d5d9d01b3"}, + {file = "deepmerge-0.2.1.tar.gz", hash = "sha256:5fbd777507dd86c767048bddb2c50adf7da30f7688fe3f3f4e6ede6226dd4b20"}, ] flake8 = [ {file = "flake8-3.8.4-py2.py3-none-any.whl", hash = "sha256:749dbbd6bfd0cf1318af27bf97a14e28e5ff548ef8e5b1566ccfb25a11e7c839"}, diff --git a/pyproject.toml b/pyproject.toml index 6be4c08..3e3984d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -17,7 +17,7 @@ httpx = "^0.17.0" gunicorn = "^20.0.4" pydantic = "^1.8.1" spectree = "^0.4.0" -deepmerge = "^0.1.1" +deepmerge = "^0.2.1" sentry-sdk = "^0.19.5" [tool.poetry.dev-dependencies] -- cgit v1.2.3 From 9d7b0caa10b4161f0c8ce2edded09ec9638ff0a6 Mon Sep 17 00:00:00 2001 From: MarkKoz Date: Sat, 13 Mar 2021 15:03:39 -0800 Subject: Use .gitattributes to normalise line endings --- .gitattributes | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..176a458 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +* text=auto -- cgit v1.2.3