Skip to content

Merge main into deploy#294

Merged
jjoonleo merged 10 commits into
deployfrom
codexd/merge-main-into-deploy
May 7, 2026
Merged

Merge main into deploy#294
jjoonleo merged 10 commits into
deployfrom
codexd/merge-main-into-deploy

Conversation

@jjoonleo

@jjoonleo jjoonleo commented May 7, 2026

Copy link
Copy Markdown
Contributor

Summary

  • Merge latest main into deploy through a conflict-resolution branch.
  • Resolve conflicts by keeping main's hardened Docker/GHCR deployment configuration and redacted auth logging.
  • Avoid direct push to deploy so production deployment only runs after this PR is merged.

Verification

  • ./gradlew bootJar --no-daemon
  • IMAGE_TAG=test docker compose config
  • deploy workflow YAML parse
  • git diff --check

jjoonleo and others added 10 commits May 7, 2026 13:22
# Conflicts:
#	ontime-back/src/main/java/devkor/ontime_back/dto/FeedbackAddDto.java
#	ontime-back/src/main/java/devkor/ontime_back/global/jwt/JwtAuthenticationFilter.java
[codex] Secure schedule finish authorization
[codex] Remove sensitive request logging
…deploy-280

# Conflicts:
#	ontime-back/src/main/java/devkor/ontime_back/global/oauth/apple/AppleLoginService.java
…y-280

Harden Docker image and deployment configuration
…o-deploy

# Conflicts:
#	.github/workflows/deploy.yml
#	ontime-back/Dockerfile
#	ontime-back/docker-compose.yml
#	ontime-back/src/main/java/devkor/ontime_back/config/FirebaseInitialization.java
#	ontime-back/src/main/java/devkor/ontime_back/global/generallogin/handler/LoginSuccessHandler.java
#	ontime-back/src/main/java/devkor/ontime_back/global/jwt/JwtTokenProvider.java
#	ontime-back/src/main/java/devkor/ontime_back/global/oauth/apple/AppleLoginService.java
@jjoonleo jjoonleo merged commit 6e5769b into deploy May 7, 2026
@jjoonleo jjoonleo deleted the codexd/merge-main-into-deploy branch May 7, 2026 15:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant