diff options
| -rw-r--r-- | activesupport/lib/active_support/dependencies.rb | 2 | ||||
| -rw-r--r-- | railties/CHANGELOG | 4 | ||||
| -rw-r--r-- | railties/lib/tasks/annotations.rake | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb index 076df426d7..828015d2f3 100644 --- a/activesupport/lib/active_support/dependencies.rb +++ b/activesupport/lib/active_support/dependencies.rb @@ -383,7 +383,7 @@ module Dependencies #:nodoc: class LoadingModule #:nodoc: # Old style environment.rb referenced this method directly. Please note, it doesn't - # actualy *do* anything any more. + # actually *do* anything any more. def self.root(*args) if defined?(RAILS_DEFAULT_LOGGER) RAILS_DEFAULT_LOGGER.warn "Your environment.rb uses the old syntax, it may not continue to work in future releases." diff --git a/railties/CHANGELOG b/railties/CHANGELOG index b726937f4e..7e36909749 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,6 +1,8 @@ *SVN* -* Remove web_service generator. [Koz] +* Fixes rake annotations to search erb and builder files as well #9150 [m.langenberg] + +* Removed web_service generator [Koz] * Added the :all option to config.plugins that'll include the rest of the plugins not already explicitly named #9613 [fcheung]. Example: diff --git a/railties/lib/tasks/annotations.rake b/railties/lib/tasks/annotations.rake index 20ccad6d7b..80fe202588 100644 --- a/railties/lib/tasks/annotations.rake +++ b/railties/lib/tasks/annotations.rake @@ -30,9 +30,9 @@ class SourceAnnotationExtractor if File.directory?(item) results.update(find_in(item)) - elsif item =~ /\.r(?:b|xml|js)$/ + elsif item =~ /\.(builder|(r(?:b|xml|js)))$/ results.update(extract_annotations_from(item, /#\s*(#{tag}):?\s*(.*)$/)) - elsif item =~ /\.rhtml$/ + elsif item =~ /\.(rhtml|erb)$/ results.update(extract_annotations_from(item, /<%\s*#\s*(#{tag}):?\s*(.*?)\s*%>/)) end end |