Merge branch 'hotfix/1.6.2' into develop

# Conflicts:
#	app.json

app.json

@@ -37,17 +37,7 @@
     }
   },
   "image": "heroku/ruby",
-  "addons": [
-    {
-      "plan": "heroku-redis"
-    },
-    {
-      "plan": "heroku-postgresql",
-      "options": {
-        "version": "9.6"
-      }
-    }
-  ],
+  "addons": [ "heroku-redis", "heroku-postgresql"],
   "buildpacks": [
     {
       "url": "heroku/ruby"

docker-compose.production.yaml

@@ -39,7 +39,7 @@ services:
     command: ['bundle', 'exec', 'sidekiq', '-C', 'config/sidekiq.yml']
 
   postgres:
-    image: postgres:11.6
+    image: postgres:12
     restart: always
     ports:
       - '5432:5432'

docker-compose.yaml

@@ -82,7 +82,7 @@ services:
     command: bin/webpack-dev-server
 
   postgres:
-    image: postgres:11.6
+    image: postgres:12
     restart: always
     ports:
       - '5432:5432'