aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-01-29 05:14:31 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-01-29 05:14:31 +0000
commit708a982cb493838cac25c575b14afd20aadba818 (patch)
treecbc2b336ac926526afbc094278179bff2ae31327 /ChangeLog
parentf54b960d30cc45d0f7592a49868a5fae4feab9e3 (diff)
downloadruby-708a982cb493838cac25c575b14afd20aadba818.tar.gz
erb.rb: duplicated magic comments [Fix GH-1229]
* lib/erb.rb (ERB#def_method): insert def line just before the first non-comment and non-empty line, not to leave duplicated and stale magic comments. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53684 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 73371bc898..d1bf010e8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Jan 29 14:13:28 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/erb.rb (ERB#def_method): insert def line just before the
+ first non-comment and non-empty line, not to leave duplicated
+ and stale magic comments.
+
Fri Jan 29 11:13:33 2016 Jeremy Evans <code@jeremyevans.net>
* lib/erb.rb (ERB#set_eoutvar): explicitly make mutable string as