Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Remove deprecated Erubis ERB handler
  • Loading branch information
rafaelfranca committed Oct 23, 2017
1 parent 40cadf5 commit 7de7f12
Show file tree
Hide file tree
Showing 7 changed files with 4 additions and 117 deletions.
3 changes: 0 additions & 3 deletions Gemfile
Expand Up @@ -51,9 +51,6 @@ gem "dalli", ">= 2.2.1"
gem "listen", ">= 3.0.5", "< 3.2", require: false
gem "libxml-ruby", platforms: :ruby

# Action View. For testing Erubis handler deprecation.
gem "erubis", "~> 2.7.0", require: false

# for railties app_generator_test
gem "bootsnap", ">= 1.1.0", require: false

Expand Down
2 changes: 0 additions & 2 deletions Gemfile.lock
Expand Up @@ -253,7 +253,6 @@ GEM
em-socksify (0.3.1)
eventmachine (>= 1.0.0.beta.4)
erubi (1.6.1)
erubis (2.7.0)
et-orbi (1.0.5)
tzinfo
event_emitter (0.2.6)
Expand Down Expand Up @@ -540,7 +539,6 @@ DEPENDENCIES
delayed_job
delayed_job_active_record
em-hiredis
erubis (~> 2.7.0)
google-cloud-storage (~> 1.3)
hiredis
json (>= 2.0.0)
Expand Down
4 changes: 4 additions & 0 deletions actionview/CHANGELOG.md
@@ -1,3 +1,7 @@
* Remove deprecated Erubis ERB handler.

*Rafael Mendonça França*

* Remove default `alt` text generation.

Fixes #30096
Expand Down
3 changes: 0 additions & 3 deletions actionview/lib/action_view/template/handlers/erb.rb
Expand Up @@ -3,11 +3,8 @@
module ActionView
class Template
module Handlers
autoload :Erubis, "action_view/template/handlers/erb/deprecated_erubis"

class ERB
autoload :Erubi, "action_view/template/handlers/erb/erubi"
autoload :Erubis, "action_view/template/handlers/erb/erubis"

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

This file was deleted.

83 changes: 0 additions & 83 deletions actionview/lib/action_view/template/handlers/erb/erubis.rb

This file was deleted.

This file was deleted.

0 comments on commit 7de7f12

Please sign in to comment.