Skip to content

develop 브랜치에서 main 브랜치 병합 문제 해결[2] #150

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
minsang-alt merged 50 commits into from
Mar 13, 2025
Merged

develop 브랜치에서 main 브랜치 병합 문제 해결[2] #150

Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
317b85b
refactor: ncp로 이전으로 인한 설정파일 변경
minsang-alt Nov 7, 2024
74409d5
refactor: docker file amd로 수정
minsang-alt Nov 7, 2024
b791f52
refactor: 이슈편집시 데이터 누락 문제 낙관적락으로 해결 (#131)
minsang-alt Nov 7, 2024
9f367c9
refactor: 테스트 용이하게 하기 위해 시큐리티필터 및 JWT 및 OAuth 비활성화
minsang-alt Nov 7, 2024
a268afe
refactor: 테스트 용이하게 하기 위해 시큐리티필터 및 JWT 및 OAuth 비활성화
minsang-alt Nov 7, 2024
6734e4c
Merge branch 'develop' of https://github.com/AgileHub-DQ/Backend into…
minsang-alt Nov 7, 2024
666b31c
refactor: 비관적 락으로 이슈번호 생성시 중복 해결 (#132)
minsang-alt Nov 8, 2024
04ec1c6
refactor: hikari pool 설정 및 트랜잭션 전파 수정
minsang-alt Nov 9, 2024
06333f5
refactor: hikari pool 설정 지움 (모니터링 때문에) (#133)
minsang-alt Nov 17, 2024
99ff4b5
Refactor/monitor deadlock (#134)
minsang-alt Nov 17, 2024
6a5fa0e
Refactor/monitor deadlock (#135)
minsang-alt Nov 17, 2024
112050e
Refactor/monitor deadlock (#136)
minsang-alt Nov 17, 2024
0be9b79
refactor: hikaripool 풀 사이즈 (20->50)
minsang-alt Nov 17, 2024
f692d7d
Merge remote changes
minsang-alt Nov 17, 2024
6547538
refactor: 히카리풀 관련 롤백
minsang-alt Nov 17, 2024
4b73aeb
refactor: tomcat thread 50 그리고 hikari pool 75 (#137)
minsang-alt Nov 18, 2024
699fad2
Refactor/tomcat and hikaripool (#138)
minsang-alt Nov 18, 2024
3083bd7
Refactor/tomcat and hikaripool (#139)
minsang-alt Nov 18, 2024
7795fe0
Refactor/tomcat and hikaripool (#140)
minsang-alt Nov 18, 2024
e700f43
Refactor/tomcat and hikaripool (#141)
minsang-alt Nov 18, 2024
8fb0fe6
refactor: tomcat thread remove
minsang-alt Nov 18, 2024
ea0bd98
refactor: 전파 없애기
minsang-alt Nov 18, 2024
65e0a64
refactor: thread 10개, hikari 2개
minsang-alt Nov 19, 2024
59cc140
refactor: thread 10개, hikari 5개
minsang-alt Nov 19, 2024
24ae197
refactor: thread 10개, hikari 8개
minsang-alt Nov 19, 2024
d23805c
refactor: thread 16개, hikari 8개
minsang-alt Nov 19, 2024
a4d8f2e
feat: redis issuenumber 증가 (#142)
minsang-alt Nov 19, 2024
d3b4b0c
Refactor/redis issue generate (#143)
minsang-alt Nov 20, 2024
1087f94
멤버 초대 이메일 서비스 비동기방식으로 수정 (#145)
minsang-alt Dec 7, 2024
7fab1bf
멤버 초대 이메일 발송 서비스 설계 및 고려 (#146)
minsang-alt Dec 24, 2024
b612982
refactor: log error level info -> error in retryAspect
minsang-alt Dec 24, 2024
11b99b7
refactor: async retry 분리
minsang-alt Dec 24, 2024
3f4f4e1
refactor: retryable 사용
minsang-alt Dec 24, 2024
019b67d
refactor: retryable 사용
minsang-alt Dec 24, 2024
1009062
refactor: 로그 찍기
minsang-alt Dec 24, 2024
e1bc9f7
feat: visualVM 설정
minsang-alt Dec 24, 2024
8632a70
feat: hikaripool, tomcat 스레드 설정
minsang-alt Dec 24, 2024
357ac6a
feat: hikaripool, tomcat 스레드 설정
minsang-alt Dec 24, 2024
4701006
feat: hikaripool, tomcat 스레드 설정
minsang-alt Dec 24, 2024
381423e
feat: test 및 security 복구
minsang-alt Dec 25, 2024
eca6bdb
feat: test 복구
minsang-alt Dec 25, 2024
8033d55
feat: test 복구
minsang-alt Dec 25, 2024
a8a0407
feat: test 복구
minsang-alt Dec 25, 2024
406cf04
refactor: gmail smtp retry 재시도 오류 수정
minsang-alt Feb 13, 2025
714b7e5
refactor: repository 명 수정
minsang-alt Feb 13, 2025
2ff31d0
Issue 도메인 리펙토링 및 테스트 추가 (#147)
minsang-alt Feb 18, 2025
678bc8b
DB 구조 개선: 조인 테이블 전략에서 단일 테이블 전략으로 마이그레이션 (#148)
minsang-alt Mar 5, 2025
2430ddd
Merge branch 'main' into develop
minsang-alt Mar 5, 2025
78f3de9
Merge branch 'develop' of https://github.com/AgileHub-DQ/Backend into…
minsang-alt Mar 5, 2025
491efcd
Merge branch 'develop' of https://github.com/AgileHub-DQ/Backend into…
minsang-alt Mar 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

These merge commits were added into this branch cleanly.

There are no new changes to show.