Merge remote-tracking branch 'upstream/pull/2473'

diff --git a/.travis.yml b/.travis.yml
index db9128412bc006d921684bd2764af1725293debf..b950b1e18e2cbf8083078758a08702d7493c267a 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-dist: xenial
+dist: bionic
 language: ruby
 rvm:
   - 2.5.3
@@ -9,6 +9,9 @@ addons:
   apt:
     packages:
       - libarchive-dev
+      - libgd-dev
+      - libffi-dev
+      - libbz2-dev
 services:
   - memcached
 before_script:

diff --git a/db/structure.sql b/db/structure.sql
index d0e8c21e3ba32f4213835b506e57efb9b523608a..75edb001e21f4c7381797868e6d63453054dda06 100644 (file)
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -4,6 +4,7 @@ SET client_encoding = 'UTF8';
 SET standard_conforming_strings = on;
 SELECT pg_catalog.set_config('search_path', '', false);
 SET check_function_bodies = false;
+SET xmloption = content;
 SET client_min_messages = warning;
 SET row_security = off;