Merge pull request #5 from Quantum-P3/dev

Fix account activation URL

.circleci/config.yml

@@ -11,11 +11,16 @@ jobs:
       - run:
           name: Build
           command: mvn -B -DskipTests clean package -P prod
-      # - run:
-      #     name: Test
-      #     command: mvn test -P prod
+      - run:
+          name: Test
+          command: mvn test -P prod
 
 workflows:
   datasurvey:
     jobs:
-      - build-and-test
+      - build-and-test:
+          filters:
+            branches:
+              only:
+                - main
+                - qa

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