Skip to content

Commit f23a39a

Browse files
committed
Merge remote-tracking branch 'origin/develop' into develop
2 parents d4580a8 + f72e1ac commit f23a39a

File tree

3 files changed

+2
-6
lines changed

3 files changed

+2
-6
lines changed

β€ŽREADME.mdβ€Ž

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@
4747

4848
**CI/CD**
4949

50-
- Github action
51-
- Jenkins
50+
- **Jenkins**
5251

5352
**Dependencies**
5453

β€Žsrc/main/java/org/ahpuh/surf/config/WebMvcConfig.javaβ€Ž

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ public void addCorsMappings(final CorsRegistry registry) {
3434
registry
3535
.addMapping("/**")
3636
.allowedOrigins(
37-
"https://surf-jhvkmp9am-kimyeim.vercel.app",
38-
"https://team-ahpuh-surf-fe.vercel.app",
37+
"https://surf-livid.vercel.app",
3938
"http://localhost:3000")
4039
.allowedHeaders("*")
4140
.allowCredentials(true)

β€Žsrc/main/java/org/ahpuh/surf/user/service/UserServiceImpl.javaβ€Ž

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,10 @@
2626
public class UserServiceImpl implements UserService {
2727

2828
private final AuthenticationManager authenticationManager;
29-
3029
private final PasswordEncoder passwordEncoder;
3130

3231
private final UserRepository userRepository;
3332
private final FollowRepository followRepository;
34-
3533
private final UserConverter userConverter;
3634

3735
public UserLoginResponseDto authenticate(final String email, final String password) {

0 commit comments

Comments
Β (0)