From 29d5136cea8dece522121299aa85e432aa0886a6 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Mon, 24 Oct 2016 19:36:25 +0200 Subject: [PATCH] Fixed syntax/rubocop issue. --- config/initializers/db_preferences_mysql.rb | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/config/initializers/db_preferences_mysql.rb b/config/initializers/db_preferences_mysql.rb index 61f282ed3..121608f10 100644 --- a/config/initializers/db_preferences_mysql.rb +++ b/config/initializers/db_preferences_mysql.rb @@ -23,16 +23,17 @@ 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 '+++++++++++++++++++++++++++++++++++++++++++++++++++++' - p '+ I\'m sorry, MariaDB 10.0+ is required +' - p '+++++++++++++++++++++++++++++++++++++++++++++++++++++' - exit 1 - # rubocop:enable Rails/Exit - # rubocop:enable Rails/Output + # 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 +end