diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md index da7d6b9284..58a9f28911 100644 --- a/actionview/CHANGELOG.md +++ b/actionview/CHANGELOG.md @@ -1,3 +1,7 @@ +* Remove deprecated `ActionView::Template#variants`. + + *Rafael Mendonça França* + * Remove deprecated `ActionView::Template#formats`. *Rafael Mendonça França* diff --git a/actionview/lib/action_view/template.rb b/actionview/lib/action_view/template.rb index 78a5c7514e..99162b1f3a 100644 --- a/actionview/lib/action_view/template.rb +++ b/actionview/lib/action_view/template.rb @@ -137,8 +137,6 @@ module ActionView end deprecate :original_encoding - deprecate def variants=(_); end - deprecate def variants; [variant]; end deprecate def refresh(_); self; end # Returns whether the underlying handler supports streaming. If so, diff --git a/guides/source/6_1_release_notes.md b/guides/source/6_1_release_notes.md index acbce58ace..fbb53c51b7 100644 --- a/guides/source/6_1_release_notes.md +++ b/guides/source/6_1_release_notes.md @@ -55,6 +55,8 @@ Please refer to the [Changelog][action-pack] for detailed changes. ### Removals +* Remove deprecated `ActionView::Template#variants`. + * Remove deprecated `ActionView::Template#formats`. * Remove deprecated `ActionView::Template#virtual_path=`.