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.

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

Add SITE_ID, DEBUG_TOOLBAR, ALLOWED_HOSTS, and BASE_URL to settings #707

Merged
merged 2 commits into from
Sep 19, 2023

Conversation

jochenklar
Copy link
Member

No description provided.

@MyPyDavid
Copy link
Member

MyPyDavid commented Sep 18, 2023

Do you want to split the settings in here? Or is the dependency in here for the rdmo-app?
Edit: I see now, there are no dependencies in the rdmo-app

@jochenklar
Copy link
Member Author

jochenklar commented Sep 18, 2023

The nice thing about django-split-settings is that you don't need to include AUTHENTICATION_BACKENDS, MIDDLEWARES, etc. in local.py anymore.

@jochenklar
Copy link
Member Author

@MyPyDavid can I merge?

Copy link
Member

@MyPyDavid MyPyDavid left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, looks good, thanks!
Think that default value for BASE_URL will also prevent some issues in deployments.

@afuetterer
Copy link
Member

I can fix the merge conflict, if you want.

@jochenklar
Copy link
Member Author

@afuetterer sure, go ahead.

@afuetterer
Copy link
Member

Damn it, I tried the GitHub web UI to resolve the merge conflict. I did not realize that it would then merge the branch. A rebase would have sufficed.
Should I force push later and fix this?

@MyPyDavid
Copy link
Member

Do you mean to force the branch back to b4d0452 and then rebase?

@MyPyDavid MyPyDavid added this to the 2.0.0 milestone Sep 19, 2023
@jochenklar
Copy link
Member Author

yes, I would checkout the old commit, rebase, force push.

@afuetterer
Copy link
Member

Done, sorry for the confusion.

@jochenklar jochenklar merged commit 6f29a44 into dev-2.0.0 Sep 19, 2023
18 checks passed
@jochenklar jochenklar deleted the dev-2.0.0+update_settings branch September 19, 2023 13:40
@jochenklar
Copy link
Member Author

Urgs, now it does not work with the old rdmo-app anymore ... I think we need to remove BASE_URL again, and set it in the new rdmo-app.

@jochenklar
Copy link
Member Author

Alternatively we can set it to BASE_URL = ''. What do you think @MyPyDavid ?

CalamityC pushed a commit to CalamityC/rdmo that referenced this pull request Nov 23, 2023
…e_settings

Add SITE_ID, DEBUG_TOOLBAR, ALLOWED_HOSTS, and BASE_URL to settings
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants