Skip to content

conflictの解消 #18

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

Merged
dendencat merged 2 commits into from
Sep 13, 2025
Merged

conflictの解消 #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f44d4e
conflictの解消
dendencat Sep 7, 2025
29eae3c
Merge branch 'main' into conflict-patch
dendencat Sep 13, 2025
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
8 changes: 4 additions & 4 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ services:
expose:
- 8000
environment:
SECRET_KEY: ${SECRET_KEY}
SECRET_KEY: ${SECRET_KEY} # Loaded from .env file
DEBUG: ${DEBUG:-False}
ALLOWED_HOSTS: ${ALLOWED_HOSTS:-localhost,127.0.0.1}
# Prefer passing through DATABASE_URL from .env to avoid duplication
Expand Down Expand Up @@ -112,9 +112,9 @@ services:
# Caching - Redis
redis:
image: redis:7-alpine
command: redis-server --requirepass ${REDIS_PASSWORD}
environment:
REDIS_PASSWORD: ${REDIS_PASSWORD}
command: redis-server --requirepass ${REDIS_PASSWORD:-your_redis_password} # Set a password
ports:
- "6379:6379"
networks:
- techblog_network
restart: always
Expand Down
5 changes: 4 additions & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,10 @@ flake8>=6.1,<7.0
isort>=5.13,<6.0

# Documentation
Markdown>=3.5,<4.0
markdown>=3.5,<4.0

# Optional: Image processing
# Pillow>=10.1,<11.0

# Optional: API framework
# djangorestframework>=3.14,<4.0
Expand Down
4 changes: 1 addition & 3 deletions techblog_cms/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,6 @@

# Default primary key field type
DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'


# Password validation
AUTH_PASSWORD_VALIDATORS = [
{
Expand Down Expand Up @@ -302,4 +300,4 @@
PASSWORD_HASHERS = [
'django.contrib.auth.hashers.MD5PasswordHasher',
]