Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' into assignments_in_else_branch

  • Loading branch information...
commit 620e1a7bd6057f400bfe254fb8ddea76eee7ee24 2 parents 7652eba + f7f4707
@presidentbeef authored
View
2  brakeman.gemspec
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
s.executables = ["brakeman"]
s.license = "MIT"
s.add_dependency "ruby_parser", "~>3.1.1"
- s.add_dependency "ruby2ruby", "~>2.0"
+ s.add_dependency "ruby2ruby", "2.0.3"
s.add_dependency "terminal-table", "~>1.4"
s.add_dependency "fastercsv", "~>1.5"
s.add_dependency "highline", "~>1.6"
View
2  lib/brakeman/report.rb
@@ -8,7 +8,7 @@
require 'multi_json'
require 'brakeman/version'
require 'brakeman/report/renderer'
-Dir[File.dirname(__FILE__) + 'report/initializers/*.rb'].each {|file| require file}
+Dir.glob(File.dirname(__FILE__) + '/report/initializers/*.rb').each {|file| require file }
#Generates a report based on the Tracker and the results of
#Tracker#run_checks. Be sure to +run_checks+ before generating
View
0  ...brakeman/report/intializers/faster_csv.rb → ...rakeman/report/initializers/faster_csv.rb
File renamed without changes
View
0  ...brakeman/report/intializers/multi_json.rb → ...rakeman/report/initializers/multi_json.rb
File renamed without changes
Please sign in to comment.
Something went wrong with that request. Please try again.