Changeset 7553
- Timestamp:
- 09/22/07 17:52:11 (1 year ago)
- Files:
-
- trunk/activesupport/lib/active_support/dependencies.rb (modified) (1 diff)
- trunk/railties/CHANGELOG (modified) (1 diff)
- trunk/railties/lib/tasks/annotations.rake (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/activesupport/lib/active_support/dependencies.rb
r7474 r7553 384 384 class LoadingModule #:nodoc: 385 385 # Old style environment.rb referenced this method directly. Please note, it doesn't 386 # actual y *do* anything any more.386 # actually *do* anything any more. 387 387 def self.root(*args) 388 388 if defined?(RAILS_DEFAULT_LOGGER) trunk/railties/CHANGELOG
r7543 r7553 1 1 *SVN* 2 2 3 * Remove web_service generator. [Koz] 3 * Fixes rake annotations to search erb and builder files as well #9150 [m.langenberg] 4 5 * Removed web_service generator [Koz] 4 6 5 7 * Added the :all option to config.plugins that'll include the rest of the plugins not already explicitly named #9613 [fcheung]. Example: trunk/railties/lib/tasks/annotations.rake
r6229 r7553 31 31 if File.directory?(item) 32 32 results.update(find_in(item)) 33 elsif item =~ /\. r(?:b|xml|js)$/33 elsif item =~ /\.(builder|(r(?:b|xml|js)))$/ 34 34 results.update(extract_annotations_from(item, /#\s*(#{tag}):?\s*(.*)$/)) 35 elsif item =~ /\. rhtml$/35 elsif item =~ /\.(rhtml|erb)$/ 36 36 results.update(extract_annotations_from(item, /<%\s*#\s*(#{tag}):?\s*(.*?)\s*%>/)) 37 37 end
