Merge branch 'master' into 177717903-move-constants-to-configuration-file
This commit is contained in:
commit
1118c3cbcc
3 changed files with 1 additions and 3 deletions
|
|
@ -119,6 +119,5 @@ Osem::Application.configure do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
config.assets.precompile += ['mailbot.css']
|
|
||||||
config.active_record.verbose_query_logs = true
|
config.active_record.verbose_query_logs = true
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -52,8 +52,6 @@ Osem::Application.configure do
|
||||||
ActiveSupport::Deprecation.silenced = true
|
ActiveSupport::Deprecation.silenced = true
|
||||||
end
|
end
|
||||||
|
|
||||||
config.assets.precompile += ['mailbot.css']
|
|
||||||
|
|
||||||
# Test email address
|
# Test email address
|
||||||
config.mailbot = {
|
config.mailbot = {
|
||||||
bcc_address: 'test@test.com'
|
bcc_address: 'test@test.com'
|
||||||
|
|
|
||||||
|
|
@ -9,3 +9,4 @@ Rails.application.config.assets.version = '1.0'
|
||||||
# Precompile additional assets.
|
# Precompile additional assets.
|
||||||
# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
|
# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
|
||||||
# Rails.application.config.assets.precompile += %w( search.js )
|
# Rails.application.config.assets.precompile += %w( search.js )
|
||||||
|
Rails.application.config.assets.precompile += ['mailbot.css']
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue