[Fix/#333] main-dev 연결을 위한 이슈 #334
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* [Refactor/#275]: 인덱스 제약 수정 및 추가 (#294) * [Refactor/#300] 컨트롤러 인증 구현 (#301) * [Feat/#293] 작가 description json 필드 추가 - imageUrl(required) (#299) * [#298/refactor]: 가입/인증에 따라 다른 내용 채워서 이메일 보내도록 수정 (#302) * [Chore/#303] 단순 이메일 스타일 변경입니다 (#304) * [Refactor/#305] 액션 개선 및 수정 (#306) * [Fix/#308]: 시큐리티 필터 파싱 오류 해결 (#309) * [Feat/#310] 이미지 Webp 변환 코드 구현 (#311) * [Fix/#315] 멤버의 구독 정보 제공을 위한 조회시 취소를 구분하지 않은 문제 해결 (#316) * [#317/Refactor] 시큐리티 필터 제외 목록 점검 및 수정 (#318) --------- Co-authored-by: 지훈 <hun.ca.dev@gmail.com> Co-authored-by: belljun3395 <belljun3395@gmail.com>
|
main 이랑 dev가 연결이 안되어있어서 |
|
브렌치를 main이 아니라 dev를 기준으로 땄는데 main으로 따야하는건가요..? |
# Conflicts: # .github/workflows/ecs-dev-cd.yml # .github/workflows/validate-test.yml # api-repo/src/main/kotlin/com/few/api/repo/dao/subscription/SubscriptionDao.kt # api-repo/src/test/kotlin/com/few/api/repo/explain/subscription/SubscriptionDaoExplainGenerateTest.kt # api/src/main/kotlin/com/few/api/domain/subscription/usecase/BrowseSubscribeWorkbooksUseCase.kt # api/src/main/kotlin/com/few/api/domain/workbook/service/WorkbookSubscribeService.kt # api/src/test/kotlin/com/few/api/web/controller/article/ArticleControllerTest.kt # api/src/test/kotlin/com/few/api/web/controller/subscription/SubscriptionControllerTest.kt # api/src/test/kotlin/com/few/api/web/controller/workbook/article/WorkBookArticleControllerTest.kt
belljun3395
force-pushed
the
fix/#333_belljun3395
branch
from
9c6e240
to
45ace8a
Compare
belljun3395
added a commit
that referenced
this pull request
Aug 8, 2024
This reverts commit b401e6c.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
🎫 연관 이슈
resolved: #333
💁♂️ PR 내용
🙏 작업
🙈 PR 참고 사항
📸 스크린샷
🤖 테스트 체크리스트