Skip to content

Commit 7de7f12

Browse files
committed
Remove deprecated Erubis ERB handler
1 parent 40cadf5 commit 7de7f12

File tree

7 files changed

+4
-117
lines changed

7 files changed

+4
-117
lines changed

Gemfile

-3
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,6 @@ gem "dalli", ">= 2.2.1"
5151
gem "listen", ">= 3.0.5", "< 3.2", require: false
5252
gem "libxml-ruby", platforms: :ruby
5353

54-
# Action View. For testing Erubis handler deprecation.
55-
gem "erubis", "~> 2.7.0", require: false
56-
5754
# for railties app_generator_test
5855
gem "bootsnap", ">= 1.1.0", require: false
5956

Gemfile.lock

-2
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,6 @@ GEM
253253
em-socksify (0.3.1)
254254
eventmachine (>= 1.0.0.beta.4)
255255
erubi (1.6.1)
256-
erubis (2.7.0)
257256
et-orbi (1.0.5)
258257
tzinfo
259258
event_emitter (0.2.6)
@@ -540,7 +539,6 @@ DEPENDENCIES
540539
delayed_job
541540
delayed_job_active_record
542541
em-hiredis
543-
erubis (~> 2.7.0)
544542
google-cloud-storage (~> 1.3)
545543
hiredis
546544
json (>= 2.0.0)

actionview/CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
* Remove deprecated Erubis ERB handler.
2+
3+
*Rafael Mendonça França*
4+
15
* Remove default `alt` text generation.
26

37
Fixes #30096

actionview/lib/action_view/template/handlers/erb.rb

-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,8 @@
33
module ActionView
44
class Template
55
module Handlers
6-
autoload :Erubis, "action_view/template/handlers/erb/deprecated_erubis"
7-
86
class ERB
97
autoload :Erubi, "action_view/template/handlers/erb/erubi"
10-
autoload :Erubis, "action_view/template/handlers/erb/erubis"
118

129
# Specify trim mode for the ERB compiler. Defaults to '-'.
1310
# See ERB documentation for suitable values.

actionview/lib/action_view/template/handlers/erb/deprecated_erubis.rb

-11
This file was deleted.

actionview/lib/action_view/template/handlers/erb/erubis.rb

-83
This file was deleted.

actionview/test/template/erb/deprecated_erubis_implementation_test.rb

-15
This file was deleted.

0 commit comments

Comments
 (0)