Merge branch 'main' into develop

unanchoi · web-flow · commit d24cbc699e94 · 2023-10-05T21:09:40.000+09:00
diff --git a/src/main/java/com/pophory/pophoryserver/domain/slack/SlackService.java b/src/main/java/com/pophory/pophoryserver/domain/slack/SlackService.java
@@ -44,4 +44,4 @@ private String getProfiles() {
         String activeProfile =  Arrays.stream(env.getActiveProfiles()).findFirst().orElse("");
         return activeProfile.equals("blue") || activeProfile.equals("green") ? "prod" : activeProfile;
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -44,4 +44,4 @@ private String getProfiles() {`
`44`	`44`	`String activeProfile = Arrays.stream(env.getActiveProfiles()).findFirst().orElse("");`
`45`	`45`	`return activeProfile.equals("blue") \|\| activeProfile.equals("green") ? "prod" : activeProfile;`
`46`	`46`	`}`
`47`		`-}`
	`47`	`+}`