Fix syntax error that came from merge

This commit is contained in:
Maciej Szlosarczyk 2018-04-13 15:50:51 +03:00
parent 359e444839
commit 5ad5491fc1
No known key found for this signature in database
GPG key ID: 41D62D42D3B0D765

View file

@ -15,15 +15,13 @@ require 'rails/all'
# you've limited to :test, :development, or :production. # you've limited to :test, :development, or :production.
Bundler.require(*Rails.groups) Bundler.require(*Rails.groups)
module DomainNameRegistry # Add "db" to the list hosts on which you can run `rake db:setup:all`
# Add "db" to the list hosts on which you can run `rake db:setup:all`
# Only allow that in test and development. # Only allow that in test and development.
if ['development', 'test'].include?(Rails.env) if ['development', 'test'].include?(Rails.env)
ActiveRecord::Tasks::DatabaseTasks::LOCAL_HOSTS << "db" ActiveRecord::Tasks::DatabaseTasks::LOCAL_HOSTS << "db"
end end
module Registry module DomainNameRegistry
class Application < Rails::Application class Application < Rails::Application
# Settings in config/environments/* take precedence over those specified here. # Settings in config/environments/* take precedence over those specified here.
# Application configuration should go into files in config/initializers # Application configuration should go into files in config/initializers