Merge remote-tracking branch 'upstream/pull/2204'

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 073ccb5a66dab3ad01e863d5d60e3ae569b46df4..dc1615ffc47508cecd75556cd260902d0a366b46 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -118,7 +118,7 @@ gem "canonical-rails"
 gem "logstasher"
 
 # Used to generate images for traces
-gem "gd2-ffij"
+gem "gd2-ffij", ">= 0.4.0"
 
 # Used for browser detection
 gem "browser"
@@ -139,6 +139,7 @@ group :test do
   gem "rails-controller-testing"
   gem "rubocop"
   gem "rubocop-performance"
+  gem "rubocop-rails"
   gem "webmock"
 end