Merge pull request #92 from JeongHeumChoi/main

WAKE UP docker...
PUDDY-sp · Feb 14, 2024 · c817464 · c817464
2 parents 9edb3c7 + 4adcc28
commit c817464
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -3,8 +3,6 @@ name: Java CI with Gradle
 on:
   push:
     branches: [ "dev" ]
-  pull_request:
-    branches: [ "dev" ]
 
 jobs:
   build:

diff --git a/src/main/java/sideproject/puddy/controller/ChatController.java b/src/main/java/sideproject/puddy/controller/ChatController.java
@@ -25,6 +25,7 @@ public GetChatListResponse getChatList(){
     public ResponseEntity<ChatDetailResponse> enterChat(@PathVariable Long chatId){
         return chatAndMessageService.enterChat(chatId);
     }
+
     @DeleteMapping("/chat/{chatId}")
     public ResponseEntity<String> deleteChat(@PathVariable Long chatId){
         return chatService.deleteChat(chatId);