From 03b27b5427bce4c82b9b838ebc0a2efd288b0332 Mon Sep 17 00:00:00 2001 From: Pablo Bonilla Date: Sun, 4 Jul 2021 19:00:42 -0600 Subject: [PATCH 1/2] Update production mail base-url --- src/main/resources/config/application-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/config/application-prod.yml b/src/main/resources/config/application-prod.yml index fdd0976..e3c2741 100644 --- a/src/main/resources/config/application-prod.yml +++ b/src/main/resources/config/application-prod.yml @@ -116,7 +116,7 @@ jhipster: token-validity-in-seconds: 86400 token-validity-in-seconds-for-remember-me: 2592000 mail: # specific JHipster mail property, for standard properties see MailProperties - base-url: http://my-server-url-to-change # Modify according to your server's URL + base-url: http://datasurvey.org # Modify according to your server's URL logging: use-json-format: false # By default, logs are not in Json format logstash: # Forward logs to logstash over a socket, used by LoggingConfiguration From a16644ac66795f5983ee1878844eef26072a6035 Mon Sep 17 00:00:00 2001 From: Pablo Bonilla Date: Sun, 4 Jul 2021 19:11:15 -0600 Subject: [PATCH 2/2] Update CircleCI branch filter --- .circleci/config.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 17351cc..cb15a68 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -19,8 +19,8 @@ workflows: datasurvey: jobs: - build-and-test: - filters: - branches: - only: - - main - - qa + filters: + branches: + only: + - main + - qa