diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-05-04 10:14:10 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-05-04 10:14:10 -0700 |
| commit | b13849de88cb330aaedee0881862ea55bfa33c85 (patch) | |
| tree | 6f12e128297ef19ba0a8be3be826a9aeb14ca133 /actionpack/lib/action_dispatch/middleware/templates/rescues | |
| parent | c4f02295df74ed4e09b664dd5bf3d00a5aa9b6a4 (diff) | |
| parent | 510cf0ad93f07e9285178c8b7ba7d4d68c139fec (diff) | |
| download | rails-b13849de88cb330aaedee0881862ea55bfa33c85.tar.gz rails-b13849de88cb330aaedee0881862ea55bfa33c85.tar.bz2 rails-b13849de88cb330aaedee0881862ea55bfa33c85.zip | |
Merge branch 'master' into session
* master: (55 commits)
extract deprecated dynamic methods
Add some docs and changelog entry
Allow overriding exception handling in threaded consumer
Allow configuring a different queue consumer
actually don't need to expand the aggregates at all
#to_sym is unnecessary
de-globalise method
extract code from AR::Base
clean up implementation of dynamic methods. use method compilation etc.
Fix ActiveModel README example
mention database mapping in getting started guide
Remove vestiges of the http_only! config from configuring guide
Remove content-length as well
Make ActionController#head pass rack-link
RouteSet: optimize routes generation when globbing is used
Allows assert_redirected_to to accept a regular expression
use extract_options!
No need to force conversion to Symbol since case ensures it's already one.
No need to work around 1.8 warnings anymore.
Update command line guide
...
Diffstat (limited to 'actionpack/lib/action_dispatch/middleware/templates/rescues')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/templates/rescues/routing_error.erb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/templates/rescues/routing_error.erb b/actionpack/lib/action_dispatch/middleware/templates/rescues/routing_error.erb index f06c07daa5..177d383e94 100644 --- a/actionpack/lib/action_dispatch/middleware/templates/rescues/routing_error.erb +++ b/actionpack/lib/action_dispatch/middleware/templates/rescues/routing_error.erb @@ -12,4 +12,6 @@ <% end %> <p> Try running <code>rake routes</code> for more information on available routes. -</p>
\ No newline at end of file +</p> + +<%= render :template => "rescues/_trace" %> |