diff options
author | Xavier Noria <fxn@hashref.com> | 2016-09-03 10:13:30 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-03 10:13:30 +0200 |
commit | 57b95c39869e20ef4db9850b9328e6ea52ca7377 (patch) | |
tree | 8cd1d61de778ce17e06db8687278f01099b91e1b /activesupport | |
parent | f2f00ca54a83e86ef845ec9fb3e9e373d367550f (diff) | |
parent | 7c70430ce063af501154591f114dfc02e559f774 (diff) | |
download | rails-57b95c39869e20ef4db9850b9328e6ea52ca7377.tar.gz rails-57b95c39869e20ef4db9850b9328e6ea52ca7377.tar.bz2 rails-57b95c39869e20ef4db9850b9328e6ea52ca7377.zip |
Merge pull request #26374 from kamipo/fix_broken_heredoc_indentation
Fix broken heredoc indentation caused by rubocop auto-correct
Diffstat (limited to 'activesupport')
-rw-r--r-- | activesupport/lib/active_support/callbacks.rb | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/activesupport/lib/active_support/callbacks.rb b/activesupport/lib/active_support/callbacks.rb index a33cab0504..ecf0c0eec7 100644 --- a/activesupport/lib/active_support/callbacks.rb +++ b/activesupport/lib/active_support/callbacks.rb @@ -297,9 +297,9 @@ module ActiveSupport def self.build(chain, filter, kind, options) if filter.is_a?(String) ActiveSupport::Deprecation.warn(<<-MSG.squish) - Passing string to define callback is deprecated and will be removed - in Rails 5.1 without replacement. - MSG + Passing string to define callback is deprecated and will be removed + in Rails 5.1 without replacement. + MSG end new chain.name, filter, kind, options, chain.config @@ -751,10 +751,10 @@ module ActiveSupport set_callbacks name, CallbackChain.new(name, options) module_eval <<-RUBY, __FILE__, __LINE__ + 1 - def _run_#{name}_callbacks(&block) - __run_callbacks__(_#{name}_callbacks, &block) - end - RUBY + def _run_#{name}_callbacks(&block) + __run_callbacks__(_#{name}_callbacks, &block) + end + RUBY end end @@ -787,9 +787,9 @@ module ActiveSupport def display_deprecation_warning_for_false_terminator ActiveSupport::Deprecation.warn(<<-MSG.squish) - Returning `false` in Active Record and Active Model callbacks will not implicitly halt a callback chain in Rails 5.1. - To explicitly halt the callback chain, please use `throw :abort` instead. - MSG + Returning `false` in Active Record and Active Model callbacks will not implicitly halt a callback chain in Rails 5.1. + To explicitly halt the callback chain, please use `throw :abort` instead. + MSG end end end |