Merge remote-tracking branch 'upstream/pull/2120'
[rails.git] / Gemfile
diff --git a/Gemfile b/Gemfile
index 3cf07504549ec3038bb67402b51de2db2904a387..fa1bed46886eccae3b083b73794ba3a85e878e1a 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -114,6 +114,9 @@ gem "canonical-rails"
 # Used to generate logstash friendly log files
 gem "logstasher"
 
+# Used to generate images for traces
+gem "gd2-ffij"
+
 # Gems useful for development
 group :development do
   gem "annotate"
@@ -125,6 +128,7 @@ end
 
 # Gems needed for running tests
 group :test do
+  gem "fakefs", :require => "fakefs/safe"
   gem "minitest", "~> 5.1", :platforms => [:ruby_19, :ruby_20]
   gem "rails-controller-testing"
   gem "rubocop"