From 917439316e0f2bedcda339e70cae760745f96901 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Bauer?= Date: Mon, 24 Oct 2016 12:50:35 +0200 Subject: [PATCH] .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