Skip to content

[Merge] main 브랜치에 staging 브랜치 병합#292

Merged
ItsZetty merged 81 commits intomainfrom
staging
Jan 11, 2026
Merged

[Merge] main 브랜치에 staging 브랜치 병합#292
ItsZetty merged 81 commits intomainfrom
staging

Conversation

@ItsZetty
Copy link
Contributor

🚀 Release PR

📌 목적

이번 PR은 [staging] → [main] 병합을 위한 릴리즈 PR입니다.

⚠️ 참고 사항

simhyunmin and others added 30 commits December 13, 2025 15:42
[Refactor] member 엔티티 gender, profileImageUrl, birth 컬럼 삭제
staging <- dev 변경사항 업데이트
[Refactor] 회원 삭제 시 방식 변경
[Refactor] 회원 탈퇴 시 벌크 연산 및 퍼사드 패턴 적용
[Merge] staging에 dev 브랜치 머지
deploy: update docker-compose.yml (remove adminer container and add n…
deploy: change server properties (local -> prod)
[Refactor] 회원 삭제 소프트 방식으로 변경
simhyunmin and others added 18 commits January 1, 2026 18:52
* Refactor: deploy workflow

Updated the deployment workflow to include new branch and streamlined steps for Docker Hub integration and EC2 deployment.

* Fix: Docker Hub login env var

* Fix: talkpick-server image and env file path

Updated the image for talkpick-server and modified environment configuration.

* Refactor CI flow

Updated deployment script to use Docker Compose for managing containers and added environment variable handling.

* Remove: adminer from nginx service dependencies

Removed adminer service dependency from nginx.

* Change active profile from 'prod' to 'local'

* Remove CONFIG step for application-prod.properties

Removed step to create application-prod.properties file.

* Update Docker build command to use latest tag

* Add production configuration for application

* Remove .env properties import from application-prod.yml

Removed the optional import of .env properties.

* Test: Ensure no prod properties exist before build

Add step to clean up production properties before build

* Update docker-compose.yml

* Change deployment branch from 'deploy/265' to 'staging'

* refactor: 회원 복구 API 명세 추가 - #267

* refactor: 회원 소프트 삭제 후 하드 삭제를 위한 스케줄러 설정 - #267

* refactor: 회원 복구 API 화이트리스트 추가 - #267

* refactor: 회원 삭제 시 소프트 삭제 방식으로 변경 - #267

* refactor: 회원 삭제 스케줄러 동작 시 스레드 풀 설정 - #267

* feat: Add event handler for TopicLike - #260

* refactor: Apply event-driven architecture with transactional safety - #260

* test: Add Notice test code - #260

* test: Add test code about Random/Topic/Today - #260

* test: Add exception and boundary value test cases - #260

* feat: 로그인 타입에 GOOGLE 추가 - #272

* feat: 구글 소셜 로그인 개발 - #272

* feat: 구글 소셜 로그인 에러 핸들러 개발 - #272

* refactor: prod 설정에 google 설정 추가

* build : deploy.yml 임시 수정

* refactor: MemberCommandController에 경로 매핑 애노테이션 추가

* refactor: 멤버 컨트롤러 경로 매핑 애노테이션 추가

* refactor: 구글 로그인 permitAll에 직접 경로 명시

* build: 빌드 파일 수정

* build : deploy.yml 임시 수정

* refactor: 에러메시지 추가

* refactor: 에러메시지 추가

* build: 빌드 파일 수정

* build: 빌드 파일 수정

* refactor: appleOidcService 수정

* refactor: 회원 좋아요 누른 토픽 id 수정 - #278

* Deploy: github actions deploy.yml 수정

* Deploy: fix the env file path

* Deploy: fix the env file path

* Deploy: fix the env file path

* update deploy.yml (Deploy to EC2 configuration)

* update docker-compose.yml

* update deploy.yml

* update docker-compose.yml

* update nginx config

* update entrypoint.sh

* update entrypoint.sh

* update nginx configurations

* update application.yml

* update nginx configurations

* update nginx configurations

* update nginx configurations

* update nginx conf

* update nginx static index.html file path

* remove the nginx folder

* change the push branch

---------

Co-authored-by: simhyunmin <shm66371945@gmail.com>
Co-authored-by: Zetty <wjdahrrla@gmail.com>
[Docs] 이슈 템플릿 내용 수정
[Docs] 토픽 서버 구조 문서 작성
Deploy: set up promtail-based log monitoring to grafana cloud
[Refactor] CategoryGroup 테이블 제거 후 관련된 코드 수정
[Merge] staging 브랜치에 dev 브랜치 병합
@coderabbitai
Copy link

coderabbitai bot commented Jan 10, 2026

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.


Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@ItsZetty ItsZetty requested review from Hszoo and simhyunmin and removed request for simhyunmin January 10, 2026 05:56
@ItsZetty ItsZetty merged commit 9866a8a into main Jan 11, 2026
2 checks passed
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.

3 participants