Skip to content

fix: docker-compose 충돌 해결 #610

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
whqtker merged 49 commits into from
Jan 19, 2026
Merged

fix: docker-compose 충돌 해결 #610

Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
6c41af3
Merge pull request #41 from solid-connection/main
wibaek Jul 17, 2024
8776b9d
Merge pull request #42 from solid-connection/main
wibaek Jul 17, 2024
09ff0f7
Merge pull request #44 from solid-connection/main
wibaek Jul 17, 2024
50b6702
Merge pull request #55 from solid-connection/main
wibaek Aug 10, 2024
ce1026e
Merge pull request #64 from solid-connection/main
wibaek Aug 19, 2024
50fde8e
Merge pull request #69 from solid-connection/main
leesewon00 Aug 23, 2024
ccaf728
Merge pull request #74 from solid-connection/main
leesewon00 Aug 25, 2024
5a1d029
Merge pull request #77 from solid-connection/main
leesewon00 Aug 27, 2024
4a0c7b5
Merge pull request #92 from solid-connection/main
leesewon00 Sep 7, 2024
5b3f8c4
Merge pull request #95 from solid-connection/main
wibaek Sep 7, 2024
ed2b5f1
chore: release github action 임의 실행 추가
wibaek Oct 7, 2024
84ac06d
Merge pull request #105 from solid-connection/main
wibaek Oct 9, 2024
b3b17ea
Merge pull request #108 from solid-connection/main
wibaek Nov 9, 2024
2a8d022
Merge pull request #121 from solid-connection/main
wibaek Dec 16, 2024
42c02f6
Merge pull request #123 from solid-connection/main
wibaek Dec 16, 2024
04766a2
Merge pull request #127 from solid-connection/main
wibaek Dec 16, 2024
939d008
Merge pull request #142 from solid-connection/main
wibaek Jan 5, 2025
2af7b77
refactor: 기본 추천 대학 후보 추가 (#161)
nayonsoso Jan 27, 2025
ce1d88b
Merge release branch with ours strategy to sync with main
wibaek Feb 12, 2025
4dda1da
Merge pull request #199 from solid-connection/chore/release-sync
wibaek Feb 13, 2025
90a0db7
Merge pull request #209 from solid-connection/develop
wibaek Feb 15, 2025
1039236
Merge pull request #214 from solid-connection/develop
Gyuhyeok99 Feb 15, 2025
671f3e5
Merge pull request #216 from solid-connection/develop
nayonsoso Feb 16, 2025
ee146c1
Merge pull request #222 from solid-connection/develop
nayonsoso Feb 17, 2025
e3de221
Merge pull request #225 from solid-connection/develop
nayonsoso Feb 17, 2025
a7e2647
Merge pull request #228 from solid-connection/release
Gyuhyeok99 Feb 19, 2025
f1c58f4
Merge pull request #235 from solid-connection/develop
nayonsoso Feb 20, 2025
9091dd7
Merge pull request #238 from solid-connection/release
nayonsoso Feb 20, 2025
fa30d3f
Merge pull request #243 from solid-connection/develop
wibaek Feb 20, 2025
cc4c28d
Merge pull request #245 from solid-connection/release
nayonsoso Feb 21, 2025
0962b9e
Merge pull request #249 from solid-connection/develop
wibaek Feb 22, 2025
f8b2174
Merge pull request #251 from solid-connection/develop
wibaek Feb 24, 2025
27fade4
Merge pull request #271 from solid-connection/develop
nayonsoso Apr 4, 2025
44f6cae
Merge remote-tracking branch 'origin/master' into release
nayonsoso Apr 8, 2025
b481b40
Merge pull request #274 from solid-connection/release
nayonsoso Apr 9, 2025
003aea0
Merge pull request #281 from solid-connection/develop
wibaek Apr 13, 2025
9781c5b
Merge pull request #283 from solid-connection/release
wibaek Apr 15, 2025
645f620
[RELEASE] 250826 릴리즈
Gyuhyeok99 Aug 26, 2025
5e99dfd
[DEPLOY] v2.0.0
Gyuhyeok99 Aug 26, 2025
5dc19c3
fix: config.alloy 경로 수정
whqtker Aug 26, 2025
344e202
Merge pull request #490 from whqtker/hotfix/fix-docker-compose
whqtker Aug 26, 2025
99bc01b
hotfix: 모의지원 현황 어드민 권한 제거
Gyuhyeok99 Aug 26, 2025
aa60ef0
hotfix: import 제거
Gyuhyeok99 Aug 26, 2025
fab2e32
hotfix: 모의지원 현황 어드민 권한 제거
Gyuhyeok99 Aug 26, 2025
998e043
[RELEASE] 250927 릴리즈
Gyuhyeok99 Sep 28, 2025
a71cf7e
fix: 충돌 해결
Gyuhyeok99 Sep 28, 2025
edd2986
fix: 충돌 해결
Gyuhyeok99 Sep 28, 2025
6e8a52d
[RELEASE] 251103 릴리즈
Gyuhyeok99 Nov 4, 2025
0fa1d2a
fix: 충돌 해결
whqtker Jan 19, 2026
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.