diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2014-11-30 10:28:16 +0000 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2014-11-30 10:28:16 +0000 |
| commit | 079ac4a0584b24625266a0e9448503d1b96c2b7f (patch) | |
| tree | 6a28edeb393cd095de252335f9e3c9cec7c78d13 /actionview/lib/action_view/template/handlers/erb.rb | |
| parent | bd9ffa7e1fb433f359ee096a2afd924a652d1912 (diff) | |
| parent | 6874133f9e5ca79f30f43632da4338d7b82ddeff (diff) | |
| download | rails-079ac4a0584b24625266a0e9448503d1b96c2b7f.tar.gz rails-079ac4a0584b24625266a0e9448503d1b96c2b7f.tar.bz2 rails-079ac4a0584b24625266a0e9448503d1b96c2b7f.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionview/lib/action_view/template/handlers/erb.rb')
| -rw-r--r-- | actionview/lib/action_view/template/handlers/erb.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionview/lib/action_view/template/handlers/erb.rb b/actionview/lib/action_view/template/handlers/erb.rb index 3c2224fbf5..85a100ed4c 100644 --- a/actionview/lib/action_view/template/handlers/erb.rb +++ b/actionview/lib/action_view/template/handlers/erb.rb @@ -35,7 +35,7 @@ module ActionView end end - BLOCK_EXPR = /\s+(do|\{)(\s*\|[^|]*\|)?\s*\Z/ + BLOCK_EXPR = /\s*((\s+|\))do|\{)(\s*\|[^|]*\|)?\s*\Z/ def add_expr_literal(src, code) flush_newline_if_pending(src) |