diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2016-02-25 11:13:42 +0100 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2016-02-25 11:13:42 +0100 |
| commit | 46cb45df485d6f4d67a8e448a142bcab47fc0f2a (patch) | |
| tree | 5818cf60a3c281159a82da5123791110f0aee346 | |
| parent | 6b3176170a35cbd20c8599c31fc5cbe46e02562c (diff) | |
| download | rails-46cb45df485d6f4d67a8e448a142bcab47fc0f2a.tar.gz rails-46cb45df485d6f4d67a8e448a142bcab47fc0f2a.tar.bz2 rails-46cb45df485d6f4d67a8e448a142bcab47fc0f2a.zip | |
Additional review of 6b31761.
* Fixes typos in error message and release notes.
* Removes unused template test file.
| -rw-r--r-- | actionpack/lib/action_controller/metal/implicit_render.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/fixtures/implicit_render_test/some_action_2.html+zomg.erb | 1 | ||||
| -rw-r--r-- | guides/source/5_0_release_notes.md | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/metal/implicit_render.rb b/actionpack/lib/action_controller/metal/implicit_render.rb index 1f0179a287..6b540d42c7 100644 --- a/actionpack/lib/action_controller/metal/implicit_render.rb +++ b/actionpack/lib/action_controller/metal/implicit_render.rb @@ -37,7 +37,7 @@ module ActionController if template_exists?(action_name.to_s, _prefixes, variants: request.variant) render(*args) elsif any_templates?(action_name.to_s, _prefixes) - message = "#{self.class.name}\##{action_name} does not know how to repond " \ + message = "#{self.class.name}\##{action_name} does not know how to respond " \ "to this request. There are other templates available for this controller " \ "action but none of them were suitable for this request.\n\n" \ "This usually happens when the client requested an unsupported format " \ diff --git a/actionpack/test/fixtures/implicit_render_test/some_action_2.html+zomg.erb b/actionpack/test/fixtures/implicit_render_test/some_action_2.html+zomg.erb deleted file mode 100644 index 7d8187321c..0000000000 --- a/actionpack/test/fixtures/implicit_render_test/some_action_2.html+zomg.erb +++ /dev/null @@ -1 +0,0 @@ -zomg diff --git a/guides/source/5_0_release_notes.md b/guides/source/5_0_release_notes.md index 52dbe78563..dc631e5cb9 100644 --- a/guides/source/5_0_release_notes.md +++ b/guides/source/5_0_release_notes.md @@ -257,7 +257,7 @@ Please refer to the [Changelog][action-pack] for detailed changes. ([Pull Request](https://github.com/rails/rails/pull/17573)) * Controller actions without an explicit `render` call and with no - corresponding templates will render `head :no_conten` implicitly + corresponding templates will render `head :no_content` implicitly instead of raising an error. (Pull Request [1](https://github.com/rails/rails/pull/19377), [2](https://github.com/rails/rails/pull/23827)) |