Removing hound ci tips

pull/5774/head
jesusvazquez 9 years ago
parent 3327d590a6
commit 17a8005c65

@ -2,22 +2,21 @@
require File.expand_path('../application', __FILE__)
module Rails
class Application
class Configuration
class Application
class Configuration
def database_configuration
require 'erb'
if ENV['RAILS_DATABASE_FILE']
db_config = YAML.load(File.read(File.join(Rails.root, 'config/' + ENV['RAILS_DATABASE_FILE'])))
else
db_config = YAML.load(File.read(File.join(Rails.root, 'config/database.yml')))
end
db_config
end
end
end
def database_configuration
require 'erb'
if ENV['RAILS_DATABASE_FILE']
db_config = YAML.load(File.read(File.join(Rails.root, 'config/' + ENV['RAILS_DATABASE_FILE'])))
else
db_config = YAML.load(File.read(File.join(Rails.root, 'config/database.yml')))
end
db_config
end
end
end
end
# Initialize the rails application
CartoDB::Application.initialize!

@ -2,9 +2,9 @@ require 'active_record'
::Sequel::DATABASES.each{|d| d.sql_log_level = :debug }
if ENV['RAILS_DATABASE_FILE']
if ENV['RAILS_DATABASE_FILE']
@dbconfig = YAML.load(File.read(File.join(Rails.root, 'config/' + ENV['RAILS_DATABASE_FILE'])))
else
else
@dbconfig = YAML.load(File.read(File.join(Rails.root, 'config/database.yml')))
end
# INFO: our current database.yml sets Sequel PostgreSQL adapter, which is called 'postgres'. Rails' is 'postgresql'

Loading…
Cancel
Save