Merge branch 'dev' into release

thehyve · Oct 14, 2019 · 38cf9d8 · 38cf9d8
2 parents cb792a7 + 2f6bd13
commit 38cf9d8
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,6 +1,6 @@
 FROM openjdk:8-jre-alpine
 
-ARG GB_BACKEND_VERSION="1.0.2"
+ARG GB_BACKEND_VERSION="1.0.3"
 
 ENV GB_BACKEND_WAR_URL https://repo.thehyve.nl/content/repositories/releases/nl/thehyve/gb-backend/${GB_BACKEND_VERSION}/gb-backend-${GB_BACKEND_VERSION}.war
 

diff --git a/docker/README.md b/docker/README.md
@@ -43,7 +43,7 @@ Publish the image to [Docker Hub](https://hub.docker.com/r/thehyve/glowing-bear-
 
 ```bash
 docker login
-GB_BACKEND_VERSION="1.0.2"
+GB_BACKEND_VERSION="1.0.3"
 docker tag glowing-bear-backend "thehyve/glowing-bear-backend:${GB_BACKEND_VERSION}"
 docker push "thehyve/glowing-bear-backend:${GB_BACKEND_VERSION}"
 ```
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -14,7 +14,7 @@ services:
 
   gb-backend:
     container_name: gb-backend
-    image: thehyve/glowing-bear-backend:1.0.2
+    image: thehyve/glowing-bear-backend:1.0.3
     ports:
       - 8083:8083
     environment:

diff --git a/gb-backend/src/main/groovy/nl/thehyve/gb/backend/EmailGenerator.groovy b/gb-backend/src/main/groovy/nl/thehyve/gb/backend/EmailGenerator.groovy
@@ -54,7 +54,7 @@ class EmailGenerator {
         String footer = [
                 "You can login to ${clientAppLink} to reload your cohorts and review the new data available.",
                 "The list of cohorts is in the left panel. Click on the cohort and select 'Show subscription records' to see the identifiers of the records that were added or removed.",
-
+                '',
                 'Regards,',
                 '',
                 clientAppName,

diff --git a/gb-backend/src/test/groovy/nl/thehyve/gb/backend/user/EmailGeneratorSpec.groovy b/gb-backend/src/test/groovy/nl/thehyve/gb/backend/user/EmailGeneratorSpec.groovy
@@ -75,7 +75,7 @@ class EmailGeneratorSpec extends Specification {
                 '</table>' +
                 '<p />You can login to <a href="https://abc.example.com">ABC</a> to reload your cohorts and review the new data available.' +
                 '<br />The list of cohorts is in the left panel. Click on the cohort and select \'Show subscription records\' to see the identifiers of the records that were added or removed.' +
-                '<br />Regards,<br /><br />ABC'
+                '<br /><br />Regards,<br /><br />ABC'
         when:
         def realContent = EmailGenerator.getQuerySubscriptionUpdatesBody(querySetChanges, clientAppName, clientAppUrl, reportDate)
         then: