Merge pull request #6118 from betagouv/fix-autoloader-warning
Fix "Initialization autoloaded the constants ActionText::ContentHelper" warning message
This commit is contained in:
commit
202309da20
2 changed files with 9 additions and 5 deletions
2
Gemfile
2
Gemfile
|
@ -49,7 +49,7 @@ gem 'kaminari', '1.2.1' # Pagination
|
||||||
gem 'listen' # Required by ActiveSupport::EventedFileUpdateChecker
|
gem 'listen' # Required by ActiveSupport::EventedFileUpdateChecker
|
||||||
gem 'lograge'
|
gem 'lograge'
|
||||||
gem 'logstash-event'
|
gem 'logstash-event'
|
||||||
gem 'mailjet'
|
gem 'mailjet', require: false
|
||||||
gem 'openid_connect'
|
gem 'openid_connect'
|
||||||
gem 'pg'
|
gem 'pg'
|
||||||
gem 'phonelib'
|
gem 'phonelib'
|
||||||
|
|
|
@ -1,5 +1,9 @@
|
||||||
Mailjet.configure do |config|
|
ActiveSupport.on_load(:action_mailer) do
|
||||||
config.api_key = Rails.application.secrets.mailjet[:api_key]
|
require 'mailjet'
|
||||||
config.secret_key = Rails.application.secrets.mailjet[:secret_key]
|
|
||||||
config.default_from = CONTACT_EMAIL
|
Mailjet.configure do |config|
|
||||||
|
config.api_key = Rails.application.secrets.mailjet[:api_key]
|
||||||
|
config.secret_key = Rails.application.secrets.mailjet[:secret_key]
|
||||||
|
config.default_from = CONTACT_EMAIL
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Add table
Reference in a new issue