File tree 3 files changed +4
-15
lines changed
lib/action_controller/metal
3 files changed +4
-15
lines changed Original file line number Diff line number Diff line change
1
+ * Remove deprecated support to ` :nothing ` in ` render ` .
2
+
3
+ * Rafael Mendonça França*
4
+
1
5
* Remove deprecated support to ` :back ` in ` redirect_to ` .
2
6
3
7
* Rafael Mendonça França*
Original file line number Diff line number Diff line change @@ -98,11 +98,6 @@ def _normalize_options(options) #:nodoc:
98
98
options [ :html ] = ERB ::Util . html_escape ( options [ :html ] )
99
99
end
100
100
101
- if options . delete ( :nothing )
102
- ActiveSupport ::Deprecation . warn ( "`:nothing` option is deprecated and will be removed in Rails 5.1. Use `head` method to respond with empty response body." )
103
- options [ :body ] = nil
104
- end
105
-
106
101
if options [ :status ]
107
102
options [ :status ] = Rack ::Utils . status_code ( options [ :status ] )
108
103
end
Original file line number Diff line number Diff line change @@ -160,10 +160,6 @@ def conditional_hello_with_cache_control_headers
160
160
render action : "hello_world"
161
161
end
162
162
163
- def respond_with_empty_body
164
- render nothing : true
165
- end
166
-
167
163
def conditional_hello_with_bangs
168
164
render action : "hello_world"
169
165
end
@@ -371,12 +367,6 @@ def test_expires_now_with_cache_control_headers
371
367
assert_match ( /no-transform/ , @response . headers [ "Cache-Control" ] )
372
368
end
373
369
374
- def test_render_nothing_deprecated
375
- assert_deprecated do
376
- get :respond_with_empty_body
377
- end
378
- end
379
-
380
370
def test_date_header_when_expires_in
381
371
time = Time . mktime ( 2011 , 10 , 30 )
382
372
Time . stub :now , time do
You can’t perform that action at this time.
0 commit comments