Skip to content

Fix/305 #306

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
merged 32 commits into from
Oct 14, 2025
Merged

Fix/305 #306

Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
bc2e837
Merge pull request #126 from prgrms-web-devcourse-final-project/develop
sso0om Sep 30, 2025
7e7ab91
Merge pull request #134 from prgrms-web-devcourse-final-project/develop
luckhee Oct 1, 2025
cd988fd
Merge pull request #138 from prgrms-web-devcourse-final-project/develop
dooongdaeng Oct 2, 2025
dfde0a5
Merge pull request #156 from prgrms-web-devcourse-final-project/develop
sso0om Oct 3, 2025
8f1f2cb
๋ฉ”์ธ ๋จธ์ง€ (10/9) Merge pull request #169
sso0om Oct 9, 2025
a840e30
๋ฉ”์ธ ๋จธ์ง€(10/10) Merge pull request #183
sso0om Oct 10, 2025
bb9c696
Merge pull request #192 from prgrms-web-devcourse-final-project/develop
tlswltjq Oct 11, 2025
c9f1a92
๋ฉ”์ธ ๋จธ์ง€(10/12) Merge pull request #196
sso0om Oct 12, 2025
e92748f
Merge pull request #207 from prgrms-web-devcourse-final-project/develop
dooongdaeng Oct 12, 2025
d3ecc9e
Merge pull request #213 from prgrms-web-devcourse-final-project/develop
dbfgml2000 Oct 12, 2025
dcdd0d6
Merge pull request #216 from prgrms-web-devcourse-final-project/develop
tlswltjq Oct 13, 2025
61873a7
Merge pull request #225 from prgrms-web-devcourse-final-project/develop
dbfgml2000 Oct 13, 2025
c3d79a6
Merge pull request #228 from prgrms-web-devcourse-final-project/develop
dbfgml2000 Oct 13, 2025
f3084f9
Merge pull request #242 from prgrms-web-devcourse-final-project/develop
tlswltjq Oct 13, 2025
1d84377
Merge pull request #244 from prgrms-web-devcourse-final-project/develop
dooongdaeng Oct 13, 2025
84493ae
Merge pull request #248 from prgrms-web-devcourse-final-project/develop
dooongdaeng Oct 13, 2025
b61d5f5
Merge pull request #251 from prgrms-web-devcourse-final-project/develop
dooongdaeng Oct 13, 2025
400c803
Merge pull request #253 from prgrms-web-devcourse-final-project/develop
sso0om Oct 13, 2025
41b149b
Merge pull request #255 from prgrms-web-devcourse-final-project/develop
sso0om Oct 13, 2025
b73155d
Merge pull request #257 from prgrms-web-devcourse-final-project/develop
dooongdaeng Oct 13, 2025
90daaf5
Merge pull request #261 from prgrms-web-devcourse-final-project/develop
dooongdaeng Oct 13, 2025
627a551
Merge pull request #264 from prgrms-web-devcourse-final-project/develop
dbfgml2000 Oct 13, 2025
5bd7e5f
fix: DB ์™ธ๋ž˜ํ‚ค ๋ฌธ์ œ ๋ฐœ์ƒ ๋กœ์ง ์ฃผ์„ ์ฒ˜๋ฆฌ
dbfgml2000 Oct 13, 2025
30802b5
fix: ๊ธฐ์กด๊ณผ ๋™์ผํ•˜๊ฒŒ ํŠธ๋žœ์žญ์…˜ ์ฒ˜๋ฆฌํ•˜๋„๋ก ์ˆ˜์ •
dbfgml2000 Oct 13, 2025
108dd42
Merge pull request #266 from prgrms-web-devcourse-final-project/fix/265
dbfgml2000 Oct 13, 2025
09ce727
Revert "[Fix] ์šด์˜ DB ์™ธ๋ž˜ํ‚ค ๋ฌธ์ œ ์ œ"
dbfgml2000 Oct 13, 2025
7171f78
Merge pull request #267 from prgrms-web-devcourse-final-project/reverโ€ฆ
dbfgml2000 Oct 13, 2025
50854a1
Merge pull request #269 from prgrms-web-devcourse-final-project/develop
dbfgml2000 Oct 13, 2025
e4a0f7d
Merge pull request #272 from prgrms-web-devcourse-final-project/develop
dooongdaeng Oct 13, 2025
23467fb
Merge branch 'develop' of https://github.com/prgrms-web-devcourse-finโ€ฆ
dooongdaeng Oct 14, 2025
1107b1e
fix:envํŒŒ์ผ ์œ„์น˜
dooongdaeng Oct 14, 2025
546e4b2
Merge branch 'develop' of https://github.com/prgrms-web-devcourse-finโ€ฆ
dooongdaeng Oct 14, 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
2 changes: 1 addition & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ services:
environment:
- SPRING_PROFILES_ACTIVE=prod
env_file:
- /home/ssm-user/WEB6_8_FiveLogic_BE/.env
- /home/ssm-user/WEB6_8_FiveLogic_BE/back/.env
networks:
- app-network
restart: unless-stopped
Expand Down