diff options
| author | Dillon Welch <daw0328@gmail.com> | 2017-11-03 19:58:28 -0700 |
|---|---|---|
| committer | Dillon Welch <daw0328@gmail.com> | 2017-11-03 19:58:28 -0700 |
| commit | 0f28957edd6a9c281491c854b455180efc040a1c (patch) | |
| tree | 577d46d88937d4cc811e6860ce3cbdb2a1dad27a /actionview/lib | |
| parent | ec13ef75260f6d143e947b0e5176e35e4c1229c2 (diff) | |
| parent | 9ec67362054e874ed905310a79b670941fa397af (diff) | |
| download | rails-0f28957edd6a9c281491c854b455180efc040a1c.tar.gz rails-0f28957edd6a9c281491c854b455180efc040a1c.tar.bz2 rails-0f28957edd6a9c281491c854b455180efc040a1c.zip | |
Merge remote-tracking branch 'upstream/master' into nofollow-change
Diffstat (limited to 'actionview/lib')
| -rw-r--r-- | actionview/lib/action_view.rb | 1 | ||||
| -rw-r--r-- | actionview/lib/action_view/helpers/text_helper.rb | 4 | ||||
| -rw-r--r-- | actionview/lib/action_view/template/error.rb | 3 |
3 files changed, 2 insertions, 6 deletions
diff --git a/actionview/lib/action_view.rb b/actionview/lib/action_view.rb index 2069ea042a..9533f8d56c 100644 --- a/actionview/lib/action_view.rb +++ b/actionview/lib/action_view.rb @@ -76,7 +76,6 @@ module ActionView autoload :MissingTemplate autoload :ActionViewError autoload :EncodingError - autoload :MissingRequestError autoload :TemplateError autoload :WrongEncodingError end diff --git a/actionview/lib/action_view/helpers/text_helper.rb b/actionview/lib/action_view/helpers/text_helper.rb index 3044a2c0ef..84d38aa416 100644 --- a/actionview/lib/action_view/helpers/text_helper.rb +++ b/actionview/lib/action_view/helpers/text_helper.rb @@ -422,7 +422,7 @@ module ActionView def to_s value = @values[@index].to_s @index = next_index - return value + value end private @@ -446,7 +446,7 @@ module ActionView # uses an instance variable of ActionView::Base. def get_cycle(name) @_cycles = Hash.new unless defined?(@_cycles) - return @_cycles[name] + @_cycles[name] end def set_cycle(name, cycle_object) diff --git a/actionview/lib/action_view/template/error.rb b/actionview/lib/action_view/template/error.rb index 2b0b25817b..4e3c02e05e 100644 --- a/actionview/lib/action_view/template/error.rb +++ b/actionview/lib/action_view/template/error.rb @@ -10,9 +10,6 @@ module ActionView class EncodingError < StandardError #:nodoc: end - class MissingRequestError < StandardError #:nodoc: - end - class WrongEncodingError < EncodingError #:nodoc: def initialize(string, encoding) @string, @encoding = string, encoding |