diff options
| author | Godfrey Chan <godfreykfc@gmail.com> | 2014-05-23 15:47:53 -0700 |
|---|---|---|
| committer | Godfrey Chan <godfreykfc@gmail.com> | 2014-05-23 15:47:53 -0700 |
| commit | 3bc684bf04d252098a6be248876a9548da25c558 (patch) | |
| tree | c2e0f6282b65238e78794853c0dae47d8a79ca3d /actionpack | |
| parent | 6d48d979471818f8302233c1738afae1f030eea5 (diff) | |
| parent | 1d7b3fa84caec0e935df3b61573a5ef23ea69f34 (diff) | |
| download | rails-3bc684bf04d252098a6be248876a9548da25c558.tar.gz rails-3bc684bf04d252098a6be248876a9548da25c558.tar.bz2 rails-3bc684bf04d252098a6be248876a9548da25c558.zip | |
Merge pull request #15289 from zzak/future_port_c8ddb61
Future port c8ddb61 [ci skip]
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/CHANGELOG.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 2b4ff7f03d..92e94ee463 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -3,7 +3,7 @@ *Guo Xiang Tan* -* Fix 'Stack level too deep' when rendering `head :ok` in an action method +* Fix `'Stack level too deep'` when rendering `head :ok` in an action method called 'status' in a controller. Fixes #13905. @@ -71,7 +71,7 @@ 4. Use `escape_segment` rather than `escape_path` in URL generation For point 4 there are two exceptions. Firstly, when a route uses wildcard segments - (e.g. *foo) then we use `escape_path` as the value may contain '/' characters. This + (e.g. `*foo`) then we use `escape_path` as the value may contain '/' characters. This means that wildcard routes can't be optimized. Secondly, if a `:controller` segment is used in the path then this uses `escape_path` as the controller may be namespaced. @@ -101,7 +101,7 @@ *Andrew White*, *James Coglan* -* Append link to bad code to backtrace when exception is SyntaxError. +* Append link to bad code to backtrace when exception is `SyntaxError`. *Boris Kuznetsov* |