aboutsummaryrefslogtreecommitdiffstats
path: root/actiontext/lib
diff options
context:
space:
mode:
authorAkira Matsuda <ronnie@dio.jp>2019-08-01 18:43:25 +0900
committerAkira Matsuda <ronnie@dio.jp>2019-08-01 18:51:51 +0900
commit530f7805ed5790af1d472a041bc74089dc183f47 (patch)
tree9c897d7b77cd00127f8a51685506db1e5a4d00c2 /actiontext/lib
parent03018cb79be301fb40a57c9ac92a392b1eb8ee61 (diff)
downloadrails-530f7805ed5790af1d472a041bc74089dc183f47.tar.gz
rails-530f7805ed5790af1d472a041bc74089dc183f47.tar.bz2
rails-530f7805ed5790af1d472a041bc74089dc183f47.zip
It may be better to explicitly require 'object/try' where we call `try`
In most cases it works now without explicit require because it's accidentally required through active_support/core_ext/date_and_time/calculations.rb where we still call `try`, but that would stop working if we changed the Calculations implementation and remove the require call there.
Diffstat (limited to 'actiontext/lib')
-rw-r--r--actiontext/lib/action_text/attachment.rb2
-rw-r--r--actiontext/lib/action_text/attachments/trix_conversion.rb2
2 files changed, 4 insertions, 0 deletions
diff --git a/actiontext/lib/action_text/attachment.rb b/actiontext/lib/action_text/attachment.rb
index e90a3e7d48..4bd537c7c2 100644
--- a/actiontext/lib/action_text/attachment.rb
+++ b/actiontext/lib/action_text/attachment.rb
@@ -1,5 +1,7 @@
# frozen_string_literal: true
+require "active_support/core_ext/object/try"
+
module ActionText
class Attachment
include Attachments::TrixConversion, Attachments::Minification, Attachments::Caching
diff --git a/actiontext/lib/action_text/attachments/trix_conversion.rb b/actiontext/lib/action_text/attachments/trix_conversion.rb
index 24937d6c22..15319f4e37 100644
--- a/actiontext/lib/action_text/attachments/trix_conversion.rb
+++ b/actiontext/lib/action_text/attachments/trix_conversion.rb
@@ -1,5 +1,7 @@
# frozen_string_literal: true
+require "active_support/core_ext/object/try"
+
module ActionText
module Attachments
module TrixConversion