From 744312f82a7bfec12ac0ee0e006d53b1e4c11996 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bauer?= <abauer@magix.net>
Date: Sun, 23 Oct 2016 17:20:25 +0200
Subject: [PATCH 01/34] added .travis.yml file

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..b2964272c
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,3 @@
+language: ruby
+rvm:
+  - 2.3.1

From f0638ffb5755074f939f0ac85558d9956735b781 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bauer?= <abauer@magix.net>
Date: Sun, 23 Oct 2016 17:41:52 +0200
Subject: [PATCH 02/34] added dependencies to .travis.yml

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index b2964272c..9ce809cac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,6 @@
 language: ruby
 rvm:
   - 2.3.1
+before_install:
+  - sudo apt-get -qq update
+  - sudo apt-get install -y curl git-core patch build-essential bison zlib1g-dev libssl-dev libxml2-dev libxml2-dev sqlite3 libsqlite3-dev autotools-dev libxslt1-dev libyaml-0-2 autoconf automake libreadline6-dev libyaml-dev libtool libgmp-dev libgdbm-dev libncurses5-dev pkg-config libffi-dev libmysqlclient-dev mysql-server nginx

From 1ca51c232471601301d19ab91108051268a30725 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bauer?= <abauer@magix.net>
Date: Sun, 23 Oct 2016 17:43:34 +0200
Subject: [PATCH 03/34] changed dependencies to .travis.yml

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 9ce809cac..e4034a9d2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,4 +3,4 @@ rvm:
   - 2.3.1
 before_install:
   - sudo apt-get -qq update
-  - sudo apt-get install -y curl git-core patch build-essential bison zlib1g-dev libssl-dev libxml2-dev libxml2-dev sqlite3 libsqlite3-dev autotools-dev libxslt1-dev libyaml-0-2 autoconf automake libreadline6-dev libyaml-dev libtool libgmp-dev libgdbm-dev libncurses5-dev pkg-config libffi-dev libmysqlclient-dev mysql-server nginx
+  - sudo apt-get install -y curl git-core patch build-essential bison zlib1g-dev libssl-dev libxml2-dev libxml2-dev sqlite3 libsqlite3-dev autotools-dev libxslt1-dev libyaml-0-2 autoconf automake libreadline6-dev libyaml-dev libtool libgmp-dev libgdbm-dev libncurses5-dev pkg-config libffi-dev libmysqlclient-dev

From 16ba5a5153541a9f291043107410815558b25af1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bauer?= <abauer@magix.net>
Date: Sun, 23 Oct 2016 17:45:58 +0200
Subject: [PATCH 04/34] changed .travis.yml

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index e4034a9d2..d7349de63 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,3 +4,5 @@ rvm:
 before_install:
   - sudo apt-get -qq update
   - sudo apt-get install -y curl git-core patch build-essential bison zlib1g-dev libssl-dev libxml2-dev libxml2-dev sqlite3 libsqlite3-dev autotools-dev libxslt1-dev libyaml-0-2 autoconf automake libreadline6-dev libyaml-dev libtool libgmp-dev libgdbm-dev libncurses5-dev pkg-config libffi-dev libmysqlclient-dev
+  - export RAILS_ENV=production
+  - cp /config/database.yml.dist /config/database.yml
\ No newline at end of file

From 462811016e330fb09b141c304e18486558f20101 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bauer?= <abauer@magix.net>
Date: Sun, 23 Oct 2016 17:50:25 +0200
Subject: [PATCH 05/34] changed .travis.yml

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index d7349de63..cc0228546 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,4 +5,4 @@ before_install:
   - sudo apt-get -qq update
   - sudo apt-get install -y curl git-core patch build-essential bison zlib1g-dev libssl-dev libxml2-dev libxml2-dev sqlite3 libsqlite3-dev autotools-dev libxslt1-dev libyaml-0-2 autoconf automake libreadline6-dev libyaml-dev libtool libgmp-dev libgdbm-dev libncurses5-dev pkg-config libffi-dev libmysqlclient-dev
   - export RAILS_ENV=production
-  - cp /config/database.yml.dist /config/database.yml
\ No newline at end of file
+  - cp config/database.yml.dist config/database.yml
\ No newline at end of file

From c3eb98eb03ac50a22ca2164f3becc64d05f775fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bauer?= <abauer@magix.net>
Date: Sun, 23 Oct 2016 17:51:23 +0200
Subject: [PATCH 06/34] changed .travis.yml

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index cc0228546..3bbaeb358 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,4 +5,3 @@ before_install:
   - sudo apt-get -qq update
   - sudo apt-get install -y curl git-core patch build-essential bison zlib1g-dev libssl-dev libxml2-dev libxml2-dev sqlite3 libsqlite3-dev autotools-dev libxslt1-dev libyaml-0-2 autoconf automake libreadline6-dev libyaml-dev libtool libgmp-dev libgdbm-dev libncurses5-dev pkg-config libffi-dev libmysqlclient-dev
   - export RAILS_ENV=production
-  - cp config/database.yml.dist config/database.yml
\ No newline at end of file

From 6fd2645ae7ae4f9edcadbacc05a4c2208d640874 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bauer?= <abauer@magix.net>
Date: Sun, 23 Oct 2016 17:58:10 +0200
Subject: [PATCH 07/34] changed .travis.yml

---
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 3bbaeb358..b920c03bd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,5 +3,7 @@ rvm:
   - 2.3.1
 before_install:
   - sudo apt-get -qq update
-  - sudo apt-get install -y curl git-core patch build-essential bison zlib1g-dev libssl-dev libxml2-dev libxml2-dev sqlite3 libsqlite3-dev autotools-dev libxslt1-dev libyaml-0-2 autoconf automake libreadline6-dev libyaml-dev libtool libgmp-dev libgdbm-dev libncurses5-dev pkg-config libffi-dev libmysqlclient-dev
+  - sudo apt-get install -y curl git-core patch build-essential bison zlib1g-dev libssl-dev libxml2-dev libxml2-dev sqlite3 libsqlite3-dev autotools-dev libxslt1-dev libyaml-0-2 autoconf automake libreadline6-dev libyaml-dev libtool libgmp-dev libgdbm-dev libncurses5-dev pkg-config libffi-dev libmysqlclient-dev mysql-server
+  - mysql "CREATE USER 'some_user'@'localhost' IDENTIFIED BY 'some_pass'; GRANT ALL PRIVILEGES ON zammad_prod.* TO 'some_user'@'localhost';FLUSH PRIVILEGES;"
   - export RAILS_ENV=production
+  -cp config/database.yml.dist config/database.yml
\ No newline at end of file

From 907d84e1e7256990a179e6e07ee292232aa70b35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bauer?= <abauer@magix.net>
Date: Sun, 23 Oct 2016 18:04:11 +0200
Subject: [PATCH 08/34] changed .travis.yml

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b920c03bd..97037ead5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,6 @@ rvm:
 before_install:
   - sudo apt-get -qq update
   - sudo apt-get install -y curl git-core patch build-essential bison zlib1g-dev libssl-dev libxml2-dev libxml2-dev sqlite3 libsqlite3-dev autotools-dev libxslt1-dev libyaml-0-2 autoconf automake libreadline6-dev libyaml-dev libtool libgmp-dev libgdbm-dev libncurses5-dev pkg-config libffi-dev libmysqlclient-dev mysql-server
-  - mysql "CREATE USER 'some_user'@'localhost' IDENTIFIED BY 'some_pass'; GRANT ALL PRIVILEGES ON zammad_prod.* TO 'some_user'@'localhost';FLUSH PRIVILEGES;"
+  - mysql -e "CREATE USER 'some_user'@'localhost' IDENTIFIED BY 'some_pass'; GRANT ALL PRIVILEGES ON zammad_prod.* TO 'some_user'@'localhost';FLUSH PRIVILEGES;"
   - export RAILS_ENV=production
   -cp config/database.yml.dist config/database.yml
\ No newline at end of file

From 62d41e54a038b6c255738bbbb744427072ac36bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bauer?= <abauer@magix.net>
Date: Sun, 23 Oct 2016 18:17:48 +0200
Subject: [PATCH 09/34] changed .travis.yml

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 97037ead5..a794d52dd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,4 +6,4 @@ before_install:
   - sudo apt-get install -y curl git-core patch build-essential bison zlib1g-dev libssl-dev libxml2-dev libxml2-dev sqlite3 libsqlite3-dev autotools-dev libxslt1-dev libyaml-0-2 autoconf automake libreadline6-dev libyaml-dev libtool libgmp-dev libgdbm-dev libncurses5-dev pkg-config libffi-dev libmysqlclient-dev mysql-server
   - mysql -e "CREATE USER 'some_user'@'localhost' IDENTIFIED BY 'some_pass'; GRANT ALL PRIVILEGES ON zammad_prod.* TO 'some_user'@'localhost';FLUSH PRIVILEGES;"
   - export RAILS_ENV=production
-  -cp config/database.yml.dist config/database.yml
\ No newline at end of file
+  - cp config/database.yml.dist config/database.yml

From 6d7482dfd8a4c4564e0d5c18f0c0a920e0d720ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bauer?= <abauer@magix.net>
Date: Sun, 23 Oct 2016 18:22:31 +0200
Subject: [PATCH 10/34] changed .travis.yml

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a794d52dd..4e0ce308e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,6 @@ rvm:
 before_install:
   - sudo apt-get -qq update
   - sudo apt-get install -y curl git-core patch build-essential bison zlib1g-dev libssl-dev libxml2-dev libxml2-dev sqlite3 libsqlite3-dev autotools-dev libxslt1-dev libyaml-0-2 autoconf automake libreadline6-dev libyaml-dev libtool libgmp-dev libgdbm-dev libncurses5-dev pkg-config libffi-dev libmysqlclient-dev mysql-server
-  - mysql -e "CREATE USER 'some_user'@'localhost' IDENTIFIED BY 'some_pass'; GRANT ALL PRIVILEGES ON zammad_prod.* TO 'some_user'@'localhost';FLUSH PRIVILEGES;"
+  - mysql -e 'CREATE USER 'some_user'@'localhost' IDENTIFIED BY 'some_pass'; GRANT ALL PRIVILEGES ON zammad_prod.* TO 'some_user'@'localhost'; FLUSH PRIVILEGES;'
   - export RAILS_ENV=production
   - cp config/database.yml.dist config/database.yml

From 2aa3e836fe56458cb0c32a836cd0b0a4760d2589 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bauer?= <abauer@magix.net>
Date: Mon, 24 Oct 2016 10:48:25 +0200
Subject: [PATCH 11/34] .travis.yml changes

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 4e0ce308e..441deef90 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,6 @@ rvm:
 before_install:
   - sudo apt-get -qq update
   - sudo apt-get install -y curl git-core patch build-essential bison zlib1g-dev libssl-dev libxml2-dev libxml2-dev sqlite3 libsqlite3-dev autotools-dev libxslt1-dev libyaml-0-2 autoconf automake libreadline6-dev libyaml-dev libtool libgmp-dev libgdbm-dev libncurses5-dev pkg-config libffi-dev libmysqlclient-dev mysql-server
-  - mysql -e 'CREATE USER 'some_user'@'localhost' IDENTIFIED BY 'some_pass'; GRANT ALL PRIVILEGES ON zammad_prod.* TO 'some_user'@'localhost'; FLUSH PRIVILEGES;'
+  - mysql -e 'CREATE USER `some_user`@`localhost` IDENTIFIED BY `some_pass`; GRANT ALL PRIVILEGES ON zammad_prod.* TO `some_user`@`localhost`; FLUSH PRIVILEGES;'
   - export RAILS_ENV=production
   - cp config/database.yml.dist config/database.yml

From 7dbda87f41559e43758605f7c09268e5708434e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bauer?= <abauer@magix.net>
Date: Mon, 24 Oct 2016 10:51:53 +0200
Subject: [PATCH 12/34] .travis.yml changes

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 441deef90..a7586e931 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,6 @@ rvm:
 before_install:
   - sudo apt-get -qq update
   - sudo apt-get install -y curl git-core patch build-essential bison zlib1g-dev libssl-dev libxml2-dev libxml2-dev sqlite3 libsqlite3-dev autotools-dev libxslt1-dev libyaml-0-2 autoconf automake libreadline6-dev libyaml-dev libtool libgmp-dev libgdbm-dev libncurses5-dev pkg-config libffi-dev libmysqlclient-dev mysql-server
-  - mysql -e 'CREATE USER `some_user`@`localhost` IDENTIFIED BY `some_pass`; GRANT ALL PRIVILEGES ON zammad_prod.* TO `some_user`@`localhost`; FLUSH PRIVILEGES;'
+  - mysql --defautls-file=/etc/mysql/debian.cnf -e 'CREATE USER `some_user`@`localhost` IDENTIFIED BY `some_pass`; GRANT ALL PRIVILEGES ON zammad_prod.* TO `some_user`@`localhost`; FLUSH PRIVILEGES;'
   - export RAILS_ENV=production
   - cp config/database.yml.dist config/database.yml

From cd0fc157b5930387bdb380a0b43b9879ea48827c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bauer?= <abauer@magix.net>
Date: Mon, 24 Oct 2016 10:58:51 +0200
Subject: [PATCH 13/34] .travis.yml changes

---
 .travis.yml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a7586e931..c5ba8b071 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,17 @@
+dist: trusty
+sudo: required
+addons:
+  apt:
+    packages:
+    - mysql-server-5.6
+    - mysql-client-core-5.6
+    - mysql-client-5.6
 language: ruby
 rvm:
   - 2.3.1
 before_install:
   - sudo apt-get -qq update
-  - sudo apt-get install -y curl git-core patch build-essential bison zlib1g-dev libssl-dev libxml2-dev libxml2-dev sqlite3 libsqlite3-dev autotools-dev libxslt1-dev libyaml-0-2 autoconf automake libreadline6-dev libyaml-dev libtool libgmp-dev libgdbm-dev libncurses5-dev pkg-config libffi-dev libmysqlclient-dev mysql-server
-  - mysql --defautls-file=/etc/mysql/debian.cnf -e 'CREATE USER `some_user`@`localhost` IDENTIFIED BY `some_pass`; GRANT ALL PRIVILEGES ON zammad_prod.* TO `some_user`@`localhost`; FLUSH PRIVILEGES;'
+  - sudo apt-get install -y curl git-core patch build-essential bison zlib1g-dev libssl-dev libxml2-dev libxml2-dev sqlite3 libsqlite3-dev autotools-dev libxslt1-dev libyaml-0-2 autoconf automake libreadline6-dev libyaml-dev libtool libgmp-dev libgdbm-dev libncurses5-dev pkg-config libffi-dev libmysqlclient-dev
+  - mysql -uroot -e 'CREATE USER `some_user`@`localhost` IDENTIFIED BY `some_pass`; GRANT ALL PRIVILEGES ON zammad_prod.* TO `some_user`@`localhost`; FLUSH PRIVILEGES;'
   - export RAILS_ENV=production
   - cp config/database.yml.dist config/database.yml

From 4a5f1a32ac12e09ccd6adb17f9f45cb8f46a3c5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bauer?= <abauer@magix.net>
Date: Mon, 24 Oct 2016 11:01:43 +0200
Subject: [PATCH 14/34] .travis.yml changes

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index c5ba8b071..cc21821bd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,6 @@ rvm:
 before_install:
   - sudo apt-get -qq update
   - sudo apt-get install -y curl git-core patch build-essential bison zlib1g-dev libssl-dev libxml2-dev libxml2-dev sqlite3 libsqlite3-dev autotools-dev libxslt1-dev libyaml-0-2 autoconf automake libreadline6-dev libyaml-dev libtool libgmp-dev libgdbm-dev libncurses5-dev pkg-config libffi-dev libmysqlclient-dev
-  - mysql -uroot -e 'CREATE USER `some_user`@`localhost` IDENTIFIED BY `some_pass`; GRANT ALL PRIVILEGES ON zammad_prod.* TO `some_user`@`localhost`; FLUSH PRIVILEGES;'
+  - mysql -uroot -e 'CREATE USER some_user@localhost IDENTIFIED BY some_pass; GRANT ALL PRIVILEGES ON zammad_prod.* TO some_user@localhost; FLUSH PRIVILEGES;'
   - export RAILS_ENV=production
   - cp config/database.yml.dist config/database.yml

From 881079f5a10a7780518c539afb6b7904a5f7136c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bauer?= <abauer@magix.net>
Date: Mon, 24 Oct 2016 11:04:32 +0200
Subject: [PATCH 15/34] .travis.yml changes

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index cc21821bd..d0edc7650 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,6 +12,7 @@ rvm:
 before_install:
   - sudo apt-get -qq update
   - sudo apt-get install -y curl git-core patch build-essential bison zlib1g-dev libssl-dev libxml2-dev libxml2-dev sqlite3 libsqlite3-dev autotools-dev libxslt1-dev libyaml-0-2 autoconf automake libreadline6-dev libyaml-dev libtool libgmp-dev libgdbm-dev libncurses5-dev pkg-config libffi-dev libmysqlclient-dev
-  - mysql -uroot -e 'CREATE USER some_user@localhost IDENTIFIED BY some_pass; GRANT ALL PRIVILEGES ON zammad_prod.* TO some_user@localhost; FLUSH PRIVILEGES;'
+  - mysql -uroot -e 'CREATE USER some_user@localhost IDENTIFIED BY some_pass;'
+  - mysql -uroot -e 'GRANT ALL PRIVILEGES ON zammad_prod.* TO some_user@localhost;'
   - export RAILS_ENV=production
   - cp config/database.yml.dist config/database.yml

From 4cdd26b04e2a69087c4b01fd13e1e26497aed4a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bauer?= <abauer@magix.net>
Date: Mon, 24 Oct 2016 11:06:15 +0200
Subject: [PATCH 16/34] .travis.yml changes

---
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index d0edc7650..9890f7403 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,8 @@ addons:
     - mysql-server-5.6
     - mysql-client-core-5.6
     - mysql-client-5.6
+services:
+  - mysql
 language: ruby
 rvm:
   - 2.3.1

From 55e25c35f5527f67b18de5953df937c8c8d70fa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bauer?= <abauer@magix.net>
Date: Mon, 24 Oct 2016 11:08:39 +0200
Subject: [PATCH 17/34] .travis.yml changes

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9890f7403..a47224943 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ rvm:
 before_install:
   - sudo apt-get -qq update
   - sudo apt-get install -y curl git-core patch build-essential bison zlib1g-dev libssl-dev libxml2-dev libxml2-dev sqlite3 libsqlite3-dev autotools-dev libxslt1-dev libyaml-0-2 autoconf automake libreadline6-dev libyaml-dev libtool libgmp-dev libgdbm-dev libncurses5-dev pkg-config libffi-dev libmysqlclient-dev
-  - mysql -uroot -e 'CREATE USER some_user@localhost IDENTIFIED BY some_pass;'
-  - mysql -uroot -e 'GRANT ALL PRIVILEGES ON zammad_prod.* TO some_user@localhost;'
+  - mysql -u root -e 'CREATE USER some_user@localhost IDENTIFIED BY some_pass;'
+  - mysql -u root -e 'GRANT ALL PRIVILEGES ON zammad_prod.* TO some_user@localhost;'
   - export RAILS_ENV=production
   - cp config/database.yml.dist config/database.yml

From 3592cc8fb043af84883b5e527005d2daa8306b99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bauer?= <abauer@magix.net>
Date: Mon, 24 Oct 2016 11:10:41 +0200
Subject: [PATCH 18/34] .travis.yml changes

---
 .travis.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index a47224943..4388327ec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,3 +18,9 @@ before_install:
   - mysql -u root -e 'GRANT ALL PRIVILEGES ON zammad_prod.* TO some_user@localhost;'
   - export RAILS_ENV=production
   - cp config/database.yml.dist config/database.yml
+install:
+- bundle install --without test development postgres
+- rake db:create
+- rake db:migrate
+- rake db:seed
+- rake assets:precompile

From d403ccc1a5ebfc8477e83bb29f4e98a8c400e57e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bauer?= <abauer@magix.net>
Date: Mon, 24 Oct 2016 11:13:54 +0200
Subject: [PATCH 19/34] .travis.yml changes

---
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4388327ec..e311fd03f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,8 +14,7 @@ rvm:
 before_install:
   - sudo apt-get -qq update
   - sudo apt-get install -y curl git-core patch build-essential bison zlib1g-dev libssl-dev libxml2-dev libxml2-dev sqlite3 libsqlite3-dev autotools-dev libxslt1-dev libyaml-0-2 autoconf automake libreadline6-dev libyaml-dev libtool libgmp-dev libgdbm-dev libncurses5-dev pkg-config libffi-dev libmysqlclient-dev
-  - mysql -u root -e 'CREATE USER some_user@localhost IDENTIFIED BY some_pass;'
-  - mysql -u root -e 'GRANT ALL PRIVILEGES ON zammad_prod.* TO some_user@localhost;'
+  - mysql --defaults-extra-file=/etc/mysql/debian.cnf -e "CREATE USER 'some_user'@'localhost' IDENTIFIED BY 'some_pass'; GRANT ALL PRIVILEGES ON zammad_prod.* TO 'some_user'@'localhost'; FLUSH PRIVILEGES;"
   - export RAILS_ENV=production
   - cp config/database.yml.dist config/database.yml
 install:

From a8b516962b1c295771467b46ec43e1265cdf48dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bauer?= <abauer@magix.net>
Date: Mon, 24 Oct 2016 11:19:08 +0200
Subject: [PATCH 20/34] .travis.yml changes

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e311fd03f..dfbce8720 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,11 +14,12 @@ rvm:
 before_install:
   - sudo apt-get -qq update
   - sudo apt-get install -y curl git-core patch build-essential bison zlib1g-dev libssl-dev libxml2-dev libxml2-dev sqlite3 libsqlite3-dev autotools-dev libxslt1-dev libyaml-0-2 autoconf automake libreadline6-dev libyaml-dev libtool libgmp-dev libgdbm-dev libncurses5-dev pkg-config libffi-dev libmysqlclient-dev
-  - mysql --defaults-extra-file=/etc/mysql/debian.cnf -e "CREATE USER 'some_user'@'localhost' IDENTIFIED BY 'some_pass'; GRANT ALL PRIVILEGES ON zammad_prod.* TO 'some_user'@'localhost'; FLUSH PRIVILEGES;"
+  - mysql -e "create database IF NOT EXISTS test2;" -uroot
   - export RAILS_ENV=production
   - cp config/database.yml.dist config/database.yml
 install:
 - bundle install --without test development postgres
+script:
 - rake db:create
 - rake db:migrate
 - rake db:seed

From aad184493ce7c0a1d0a7e97452f1923fde2e7be8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bauer?= <abauer@magix.net>
Date: Mon, 24 Oct 2016 11:24:38 +0200
Subject: [PATCH 21/34] .travis.yml changes

---
 .pkgr.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.pkgr.yml b/.pkgr.yml
index f052f7312..5b0bd20c5 100644
--- a/.pkgr.yml
+++ b/.pkgr.yml
@@ -11,7 +11,12 @@ targets:
       - postgresql
       - postgresql-server
       - postgresql-devel
-
+  ubuntu-16.04:
+    dependencies:
+      - httpd
+      - postgresql
+      - postgresql-server
+      - postgresql-devel
 before:
   - uname -a
   - ruby -v

From 30fa9ed95cb0c7a049dab9b0dcd2f3f4ff300f6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bauer?= <abauer@magix.net>
Date: Mon, 24 Oct 2016 11:38:06 +0200
Subject: [PATCH 22/34] .travis.yml changes

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index dfbce8720..f05258876 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ rvm:
 before_install:
   - sudo apt-get -qq update
   - sudo apt-get install -y curl git-core patch build-essential bison zlib1g-dev libssl-dev libxml2-dev libxml2-dev sqlite3 libsqlite3-dev autotools-dev libxslt1-dev libyaml-0-2 autoconf automake libreadline6-dev libyaml-dev libtool libgmp-dev libgdbm-dev libncurses5-dev pkg-config libffi-dev libmysqlclient-dev
-  - mysql -e "create database IF NOT EXISTS test2;" -uroot
+  - mysql -e "create user some_user@localhost IDENTIFIED BY some_pass;" -uroot
   - export RAILS_ENV=production
   - cp config/database.yml.dist config/database.yml
 install:

From d07d9ee7b864acdcb017306b60df9894fbce6c28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bauer?= <abauer@magix.net>
Date: Mon, 24 Oct 2016 11:41:49 +0200
Subject: [PATCH 23/34] .travis.yml changes

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index f05258876..270620eee 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ rvm:
 before_install:
   - sudo apt-get -qq update
   - sudo apt-get install -y curl git-core patch build-essential bison zlib1g-dev libssl-dev libxml2-dev libxml2-dev sqlite3 libsqlite3-dev autotools-dev libxslt1-dev libyaml-0-2 autoconf automake libreadline6-dev libyaml-dev libtool libgmp-dev libgdbm-dev libncurses5-dev pkg-config libffi-dev libmysqlclient-dev
-  - mysql -e "create user some_user@localhost IDENTIFIED BY some_pass;" -uroot
+  - mysql -e "CREATE USER 'some_user'@'localhost' IDENTIFIED BY 'some_pass';" -uroot
   - export RAILS_ENV=production
   - cp config/database.yml.dist config/database.yml
 install:

From 5169f4ec6879a48152baaad547bd17af335809cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bauer?= <abauer@magix.net>
Date: Mon, 24 Oct 2016 11:45:50 +0200
Subject: [PATCH 24/34] .travis.yml changes

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 270620eee..bd562d6c3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ rvm:
 before_install:
   - sudo apt-get -qq update
   - sudo apt-get install -y curl git-core patch build-essential bison zlib1g-dev libssl-dev libxml2-dev libxml2-dev sqlite3 libsqlite3-dev autotools-dev libxslt1-dev libyaml-0-2 autoconf automake libreadline6-dev libyaml-dev libtool libgmp-dev libgdbm-dev libncurses5-dev pkg-config libffi-dev libmysqlclient-dev
-  - mysql -e "CREATE USER 'some_user'@'localhost' IDENTIFIED BY 'some_pass';" -uroot
+  - mysql -e "CREATE USER 'some_user'@'localhost' IDENTIFIED BY 'some_pass';GRANT ALL PRIVILEGES ON some_user.* TO 'zammad_prod'@'localhost';" -uroot
   - export RAILS_ENV=production
   - cp config/database.yml.dist config/database.yml
 install:

From 4e2785b9950d7d085cc95e7ceb7cf6c75ff9efa0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bauer?= <abauer@magix.net>
Date: Mon, 24 Oct 2016 11:51:31 +0200
Subject: [PATCH 25/34] .travis.yml changes

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index bd562d6c3..be1f49cc7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ rvm:
 before_install:
   - sudo apt-get -qq update
   - sudo apt-get install -y curl git-core patch build-essential bison zlib1g-dev libssl-dev libxml2-dev libxml2-dev sqlite3 libsqlite3-dev autotools-dev libxslt1-dev libyaml-0-2 autoconf automake libreadline6-dev libyaml-dev libtool libgmp-dev libgdbm-dev libncurses5-dev pkg-config libffi-dev libmysqlclient-dev
-  - mysql -e "CREATE USER 'some_user'@'localhost' IDENTIFIED BY 'some_pass';GRANT ALL PRIVILEGES ON some_user.* TO 'zammad_prod'@'localhost';" -uroot
+  - mysql -e "CREATE USER `some_user`@`localhost` IDENTIFIED BY `some_pass`;GRANT ALL PRIVILEGES ON some_user.* TO `zammad_prod`@`localhost`;" -uroot
   - export RAILS_ENV=production
   - cp config/database.yml.dist config/database.yml
 install:

From 5d6ba9cd3bc10ecd1dddff381a2b5d0a6f42238a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bauer?= <abauer@magix.net>
Date: Mon, 24 Oct 2016 12:03:25 +0200
Subject: [PATCH 26/34] .travis.yml changes

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index be1f49cc7..8930e407f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,7 @@ rvm:
 before_install:
   - sudo apt-get -qq update
   - sudo apt-get install -y curl git-core patch build-essential bison zlib1g-dev libssl-dev libxml2-dev libxml2-dev sqlite3 libsqlite3-dev autotools-dev libxslt1-dev libyaml-0-2 autoconf automake libreadline6-dev libyaml-dev libtool libgmp-dev libgdbm-dev libncurses5-dev pkg-config libffi-dev libmysqlclient-dev
-  - mysql -e "CREATE USER `some_user`@`localhost` IDENTIFIED BY `some_pass`;GRANT ALL PRIVILEGES ON some_user.* TO `zammad_prod`@`localhost`;" -uroot
+  - mysql -e "CREATE USER 'some_user'@'localhost' IDENTIFIED BY 'some_pass';GRANT ALL PRIVILEGES ON 'some_user.*' TO 'zammad_prod'@'localhost';" -uroot
   - export RAILS_ENV=production
   - cp config/database.yml.dist config/database.yml
 install:

From 701c61f7d19c3a21dcee1e6a89f6618323f8ee4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bauer?= <abauer@magix.net>
Date: Mon, 24 Oct 2016 12:06:22 +0200
Subject: [PATCH 27/34] .travis.yml changes

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 8930e407f..d7461aa38 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,7 +14,8 @@ rvm:
 before_install:
   - sudo apt-get -qq update
   - sudo apt-get install -y curl git-core patch build-essential bison zlib1g-dev libssl-dev libxml2-dev libxml2-dev sqlite3 libsqlite3-dev autotools-dev libxslt1-dev libyaml-0-2 autoconf automake libreadline6-dev libyaml-dev libtool libgmp-dev libgdbm-dev libncurses5-dev pkg-config libffi-dev libmysqlclient-dev
-  - mysql -e "CREATE USER 'some_user'@'localhost' IDENTIFIED BY 'some_pass';GRANT ALL PRIVILEGES ON 'some_user.*' TO 'zammad_prod'@'localhost';" -uroot
+  - mysql -e "CREATE USER 'some_user'@'localhost' IDENTIFIED BY 'some_pass';" -uroot
+  - mysql -e "GRANT ALL PRIVILEGES ON 'some_user.*' TO 'zammad_prod'@'localhost';" -uroot
   - export RAILS_ENV=production
   - cp config/database.yml.dist config/database.yml
 install:

From d51b3d9a37fd825716eb189e4ed30ef6f00a8b72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bauer?= <abauer@magix.net>
Date: Mon, 24 Oct 2016 12:19:14 +0200
Subject: [PATCH 28/34] .travis.yml changes

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index d7461aa38..f33235f9c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,7 @@ before_install:
   - sudo apt-get -qq update
   - sudo apt-get install -y curl git-core patch build-essential bison zlib1g-dev libssl-dev libxml2-dev libxml2-dev sqlite3 libsqlite3-dev autotools-dev libxslt1-dev libyaml-0-2 autoconf automake libreadline6-dev libyaml-dev libtool libgmp-dev libgdbm-dev libncurses5-dev pkg-config libffi-dev libmysqlclient-dev
   - mysql -e "CREATE USER 'some_user'@'localhost' IDENTIFIED BY 'some_pass';" -uroot
-  - mysql -e "GRANT ALL PRIVILEGES ON 'some_user.*' TO 'zammad_prod'@'localhost';" -uroot
+  - mysql -e "GRANT ALL PRIVILEGES ON *.* TO 'zammad_prod'@'localhost';" -uroot
   - export RAILS_ENV=production
   - cp config/database.yml.dist config/database.yml
 install:

From aeada623789fddc9c08c80bb61f92fc151bf0a19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bauer?= <abauer@magix.net>
Date: Mon, 24 Oct 2016 12:25:06 +0200
Subject: [PATCH 29/34] .travis.yml changes

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index f33235f9c..f8e1b1c9e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,7 @@ before_install:
   - sudo apt-get -qq update
   - sudo apt-get install -y curl git-core patch build-essential bison zlib1g-dev libssl-dev libxml2-dev libxml2-dev sqlite3 libsqlite3-dev autotools-dev libxslt1-dev libyaml-0-2 autoconf automake libreadline6-dev libyaml-dev libtool libgmp-dev libgdbm-dev libncurses5-dev pkg-config libffi-dev libmysqlclient-dev
   - mysql -e "CREATE USER 'some_user'@'localhost' IDENTIFIED BY 'some_pass';" -uroot
-  - mysql -e "GRANT ALL PRIVILEGES ON *.* TO 'zammad_prod'@'localhost';" -uroot
+  - mysql -e "GRANT ALL PRIVILEGES ON *.* TO 'some_user'@'localhost';" -uroot
   - export RAILS_ENV=production
   - cp config/database.yml.dist config/database.yml
 install:

From 9a0e995c6cfe39c959e59b28f4fcffece58ca7fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bauer?= <abauer@magix.net>
Date: Mon, 24 Oct 2016 12:28:01 +0200
Subject: [PATCH 30/34] .travis.yml changes

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index f8e1b1c9e..4a89fcf2f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,8 +14,8 @@ rvm:
 before_install:
   - sudo apt-get -qq update
   - sudo apt-get install -y curl git-core patch build-essential bison zlib1g-dev libssl-dev libxml2-dev libxml2-dev sqlite3 libsqlite3-dev autotools-dev libxslt1-dev libyaml-0-2 autoconf automake libreadline6-dev libyaml-dev libtool libgmp-dev libgdbm-dev libncurses5-dev pkg-config libffi-dev libmysqlclient-dev
-  - mysql -e "CREATE USER 'some_user'@'localhost' IDENTIFIED BY 'some_pass';" -uroot
-  - mysql -e "GRANT ALL PRIVILEGES ON *.* TO 'some_user'@'localhost';" -uroot
+  - mysql -u root -e "CREATE USER 'some_user'@'localhost' IDENTIFIED BY 'some_pass';"
+  - mysql -u root -e "GRANT ALL PRIVILEGES ON *.* TO 'some_user'@'localhost';"
   - export RAILS_ENV=production
   - cp config/database.yml.dist config/database.yml
 install:

From 1cedb7204a8dafe7bd068cea8d91cbb59b737a9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bauer?= <abauer@magix.net>
Date: Mon, 24 Oct 2016 12:29:52 +0200
Subject: [PATCH 31/34] .travis.yml changes

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4a89fcf2f..3132d63e8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,8 +14,8 @@ rvm:
 before_install:
   - sudo apt-get -qq update
   - sudo apt-get install -y curl git-core patch build-essential bison zlib1g-dev libssl-dev libxml2-dev libxml2-dev sqlite3 libsqlite3-dev autotools-dev libxslt1-dev libyaml-0-2 autoconf automake libreadline6-dev libyaml-dev libtool libgmp-dev libgdbm-dev libncurses5-dev pkg-config libffi-dev libmysqlclient-dev
-  - mysql -u root -e "CREATE USER 'some_user'@'localhost' IDENTIFIED BY 'some_pass';"
-  - mysql -u root -e "GRANT ALL PRIVILEGES ON *.* TO 'some_user'@'localhost';"
+  - mysql -u root -e "CREATE USER `some_user`@`localhost` IDENTIFIED BY `some_pass`;"
+  - mysql -u root -e "GRANT ALL PRIVILEGES ON zammad_prod.* TO `some_user`@`localhost`;"
   - export RAILS_ENV=production
   - cp config/database.yml.dist config/database.yml
 install:

From 78059397d14241dd30c0cdca7daae91c544abc6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bauer?= <abauer@magix.net>
Date: Mon, 24 Oct 2016 12:32:56 +0200
Subject: [PATCH 32/34] .travis.yml changes

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3132d63e8..cef570780 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,8 +14,8 @@ rvm:
 before_install:
   - sudo apt-get -qq update
   - sudo apt-get install -y curl git-core patch build-essential bison zlib1g-dev libssl-dev libxml2-dev libxml2-dev sqlite3 libsqlite3-dev autotools-dev libxslt1-dev libyaml-0-2 autoconf automake libreadline6-dev libyaml-dev libtool libgmp-dev libgdbm-dev libncurses5-dev pkg-config libffi-dev libmysqlclient-dev
-  - mysql -u root -e "CREATE USER `some_user`@`localhost` IDENTIFIED BY `some_pass`;"
-  - mysql -u root -e "GRANT ALL PRIVILEGES ON zammad_prod.* TO `some_user`@`localhost`;"
+  - mysql -u root -e 'CREATE USER "some_user"@"localhost" IDENTIFIED BY "some_pass";'
+  - mysql -u root -e 'GRANT ALL PRIVILEGES ON zammad_prod.* TO "some_user"@"localhost";'
   - export RAILS_ENV=production
   - cp config/database.yml.dist config/database.yml
 install:

From dc1559c7b8259da7088521269beb186fbdc70ccf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bauer?= <abauer@magix.net>
Date: Mon, 24 Oct 2016 12:42:07 +0200
Subject: [PATCH 33/34] .travis.yml changes

---
 .travis.yml                                 |  4 ++--
 config/initializers/db_preferences_mysql.rb | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cef570780..1544d3bba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,8 +14,8 @@ rvm:
 before_install:
   - sudo apt-get -qq update
   - sudo apt-get install -y curl git-core patch build-essential bison zlib1g-dev libssl-dev libxml2-dev libxml2-dev sqlite3 libsqlite3-dev autotools-dev libxslt1-dev libyaml-0-2 autoconf automake libreadline6-dev libyaml-dev libtool libgmp-dev libgdbm-dev libncurses5-dev pkg-config libffi-dev libmysqlclient-dev
-  - mysql -u root -e 'CREATE USER "some_user"@"localhost" IDENTIFIED BY "some_pass";'
-  - mysql -u root -e 'GRANT ALL PRIVILEGES ON zammad_prod.* TO "some_user"@"localhost";'
+  - mysql -u root -e "CREATE USER 'some_user'@'localhost' IDENTIFIED BY 'some_pass';"
+  - mysql -u root -e "GRANT ALL PRIVILEGES ON zammad_prod.* TO 'some_user'@'localhost';"
   - export RAILS_ENV=production
   - cp config/database.yml.dist config/database.yml
 install:
diff --git a/config/initializers/db_preferences_mysql.rb b/config/initializers/db_preferences_mysql.rb
index b5374e142..f416c7ae4 100644
--- a/config/initializers/db_preferences_mysql.rb
+++ b/config/initializers/db_preferences_mysql.rb
@@ -24,16 +24,16 @@ if ActiveRecord::Base.connection_config[:adapter] == 'mysql2'
       # rubocop:enable Rails/Exit
       # rubocop:enable Rails/Output
     end
-  elsif major.to_i < 10
-
-    # rubocop:disable Rails/Output
-    # rubocop:disable Rails/Exit
-    p '+++++++++++++++++++++++++++++++++++++++++++++++++++++'
-    p '+ I\'m sorry, MariaDB 10.0+ is required              +'
-    p '+++++++++++++++++++++++++++++++++++++++++++++++++++++'
-    exit 1
-    # rubocop:enable Rails/Exit
-    # rubocop:enable Rails/Output
+  elsif server_vendor == 'MariaDB'
+    if major.to_i < 10
 
+     # rubocop:disable Rails/Output
+     # rubocop:disable Rails/Exit
+     p '+++++++++++++++++++++++++++++++++++++++++++++++++++++'
+     p '+ I\'m sorry, MariaDB 10.0+ is required              +'
+     p '+++++++++++++++++++++++++++++++++++++++++++++++++++++'
+     exit 1
+     # rubocop:enable Rails/Exit
+     # rubocop:enable Rails/Output
   end
 end

From 0abdaa3f9a6641e7519961d059049a4a28b1fc64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Bauer?= <abauer@magix.net>
Date: Mon, 24 Oct 2016 12:50:35 +0200
Subject: [PATCH 34/34] .travis.yml changes

---
 config/initializers/db_preferences_mysql.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/config/initializers/db_preferences_mysql.rb b/config/initializers/db_preferences_mysql.rb
index f416c7ae4..61f282ed3 100644
--- a/config/initializers/db_preferences_mysql.rb
+++ b/config/initializers/db_preferences_mysql.rb
@@ -14,7 +14,6 @@ if ActiveRecord::Base.connection_config[:adapter] == 'mysql2'
   (major, minor) = server_version.split('.')
   if server_vendor == 'MySQL'
     if major.to_i < 5 || (major.to_i == 5 && minor.to_i < 6)
-
       # rubocop:disable Rails/Output
       # rubocop:disable Rails/Exit
       p '+++++++++++++++++++++++++++++++++++++++++++++++++++++'
@@ -24,9 +23,9 @@ if ActiveRecord::Base.connection_config[:adapter] == 'mysql2'
       # rubocop:enable Rails/Exit
       # rubocop:enable Rails/Output
     end
+  end
   elsif server_vendor == 'MariaDB'
     if major.to_i < 10
-
      # rubocop:disable Rails/Output
      # rubocop:disable Rails/Exit
      p '+++++++++++++++++++++++++++++++++++++++++++++++++++++'
@@ -35,5 +34,5 @@ if ActiveRecord::Base.connection_config[:adapter] == 'mysql2'
      exit 1
      # rubocop:enable Rails/Exit
      # rubocop:enable Rails/Output
+    end
   end
-end