diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-04-09 13:20:37 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-04-09 13:20:37 -0300 |
commit | bbbbfe1ac02162ecb5e9a7b560134a3221f129f3 (patch) | |
tree | 42be9f1268c6bad6bf981be9f4f726a5585c295f /railties/lib | |
parent | 6c98100620c0e441c0c8334bb079bf7567c2b521 (diff) | |
parent | 6c5a53e9ca4a81c40fbf7ebe2c63663ac9eb4f6d (diff) | |
download | rails-bbbbfe1ac02162ecb5e9a7b560134a3221f129f3.tar.gz rails-bbbbfe1ac02162ecb5e9a7b560134a3221f129f3.tar.bz2 rails-bbbbfe1ac02162ecb5e9a7b560134a3221f129f3.zip |
Merge pull request #19703 from vizcay/fix_code_statics
bugfix CodeStatics#calculate_directory_statics when dir has source ext
Diffstat (limited to 'railties/lib')
-rw-r--r-- | railties/lib/rails/code_statistics.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/railties/lib/rails/code_statistics.rb b/railties/lib/rails/code_statistics.rb index 583d005d46..fd352dc9b7 100644 --- a/railties/lib/rails/code_statistics.rb +++ b/railties/lib/rails/code_statistics.rb @@ -41,11 +41,9 @@ class CodeStatistics #:nodoc: if File.directory?(path) && (/^\./ !~ file_name) stats.add(calculate_directory_statistics(path, pattern)) + elsif file_name =~ pattern + stats.add_by_file_path(path) end - - next unless file_name =~ pattern - - stats.add_by_file_path(path) end stats |