Revert rubocop changes

pull/13257/head
Mario de Frutos 7 years ago
parent 24b45fc329
commit 9d9dd7f226

@ -185,6 +185,9 @@ Layout/SpaceBeforeSemicolon:
Layout/SpaceAroundOperators:
Enabled: true
Layout/SpaceInsideBrackets:
Enabled: true
Layout/SpaceInsideParens:
Enabled: true
@ -653,6 +656,8 @@ Lint/ElseLayout:
Enabled: false
Lint/HandleExceptions:
Enabled: false
Lint/LiteralInCondition:
Enabled: false
Lint/LiteralInInterpolation:
Enabled: false
Lint/Loop:

@ -119,7 +119,9 @@ module Carto
schema: options[:user_schema] })
raise Carto::Db::InvalidConfiguration.new('Connection needs user schema if user is not the cluster admin')
end
if !options[:as] || (options[:as] && (!options[:username] || !options[:password]))
## If we don't pass user type we are using a regular user and username/password is mandatory
if !options[:as] && (!options[:username] || !options[:password])
CartoDB::Logger.error(message: 'Db connection needs username/password for regular user',
params: { user_type: options[:as], username: options[:username] })
raise Carto::Db::InvalidConfiguration.new('Db connection needs user username/password for regular user')

Loading…
Cancel
Save