Skip to content

Commit

Permalink
Merge pull request #126 from Soongsil-CoffeeChat/dev2
Browse files Browse the repository at this point in the history
merge dev2 to main
  • Loading branch information
KimKyoHwee authored Aug 20, 2024
2 parents 460e3d6 + c026568 commit fdd8ba0
Show file tree
Hide file tree
Showing 98 changed files with 2,361 additions and 2,170 deletions.
34 changes: 17 additions & 17 deletions .github/ISSUE_TEMPLATE/♻️--refactor-.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
---
name: "♻️ [REFACTOR]"
about: 리팩토링 이슈 템플릿입니다.
title: "♻️ [REFACTOR]"
labels: "\U0001F41B bug, ♻️ refactor"
assignees: oxdjww

---

# Title
- tmp

# Content
- tmp

# TODO
- [ ] tmp
---
name: "♻️ [REFACTOR]"
about: 리팩토링 이슈 템플릿입니다.
title: "♻️ [REFACTOR]"
labels: ''
assignees: oxdjww

---

# Title
- tmp

# Content
- tmp

# TODO
- [ ] tmp
34 changes: 17 additions & 17 deletions .github/ISSUE_TEMPLATE/✨--feat--.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
---
name: "✨ [FEAT] "
about: 기능 개발 이슈 템플릿입니다.
title: "✨ [FEAT] "
labels: "✨ feature"
assignees: ''

---

# Title
- tmp

# Content
- tmp

# TODO
- [ ] tmp
---
name: "✨ [FEAT] "
about: 기능 개발 이슈 템플릿입니다.
title: "✨ [FEAT] "
labels: ''
assignees: ''

---

# Title
- tmp

# Content
- tmp

# TODO
- [ ] tmp
34 changes: 17 additions & 17 deletions .github/ISSUE_TEMPLATE/🐛--bug-.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
---
name: "\U0001F41B [BUG]"
about: 버그 이슈 템플릿입니다.
title: "\U0001F41B [BUG]"
labels: "\U0001F41B bug"
assignees: ''

---

# Title
- tmp

# Content
- tmp

# TODO
- [ ] tmp
---
name: "\U0001F41B [BUG]"
about: 버그 이슈 템플릿입니다.
title: "\U0001F41B [BUG]"
labels: ''
assignees: ''

---

# Title
- tmp

# Content
- tmp

# TODO
- [ ] tmp
27 changes: 17 additions & 10 deletions .github/ISSUE_TEMPLATE/💚--ci-.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
---
name: "\U0001F49A [CI]"
about: CI 이슈 템플릿입니다
title: "\U0001F49A [CI]"
labels: "\U0001F49A CI"
assignees: ''

---


---
name: "\U0001F49A [CI]"
about: CI 이슈 템플릿입니다
title: "\U0001F49A [CI]"
labels: ''
assignees: ''

---

# Title
- tmp

# Content
- tmp

# TODO
- [ ] tmp
8 changes: 6 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
*.DS_Store
/Users/kimkyohwee/Documents/BE프로젝트/CoffeeChat/CoffeeChat-Server/src/main/generated/**
/src/main/generated/**
HELP.md
Expand Down Expand Up @@ -40,5 +41,8 @@ out/

### HTTP TEST ###
*.http
application.log
application.log


application.log
/src/main/resources/logback.xml

This file was deleted.

This file was deleted.

This file was deleted.

55 changes: 0 additions & 55 deletions src/main/generated/com/soongsil/CoffeeChat/entity/QClub.java

This file was deleted.

54 changes: 0 additions & 54 deletions src/main/generated/com/soongsil/CoffeeChat/entity/QMentee.java

This file was deleted.

Loading

0 comments on commit fdd8ba0

Please sign in to comment.