From 31ef4cf656785a190723d2d8fb4c0fd06f4009bc Mon Sep 17 00:00:00 2001 From: Prem Sichanugrist Date: Sat, 1 Sep 2012 21:37:59 -0400 Subject: Convert all inline codes to Markdown syntax --- guides/source/upgrading_ruby_on_rails.md | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'guides/source/upgrading_ruby_on_rails.md') diff --git a/guides/source/upgrading_ruby_on_rails.md b/guides/source/upgrading_ruby_on_rails.md index 5bcc49cc55..384bb7c71e 100644 --- a/guides/source/upgrading_ruby_on_rails.md +++ b/guides/source/upgrading_ruby_on_rails.md @@ -57,21 +57,17 @@ Rails 4.0 has changed how errors attach with the `ActiveModel::Validations::Conf Rails 4.0 changed how `assert_generates`, `assert_recognizes`, and `assert_routing` work. Now all these assertions raise `Assertion` instead of `ActionController::RoutingError`. -<<<<<<< HEAD Rails 4.0 also changed the way unicode character routes are drawn. Now you can draw unicode character routes directly. If you already draw such routes, you must change them, for example: - +```ruby get Rack::Utils.escape('こんにちは'), :controller => 'welcome', :action => 'index' - +``` becomes - +```ruby get 'こんにちは', :controller => 'welcome', :action => 'index' - -======= -Rails 4.0 also changed the way unicode character routes are drawn. Now you can draw unicode character routes directly. If you already draw such routes, you must change them, e.g. `get Rack::Utils.escape('こんにちは'), :controller => 'welcome', :action => 'index'` to `get 'こんにちは', :controller => 'welcome', :action => 'index'`. ->>>>>>> Convert inline code tags to Markdown +``` ### Active Support -- cgit v1.2.3