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

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 073ccb5a66dab3ad01e863d5d60e3ae569b46df4..250221d75bd658ffeba36ae25ee33c17c0f8524a 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -118,7 +118,10 @@ gem "canonical-rails"
 gem "logstasher"
 
 # Used to generate images for traces
 gem "logstasher"
 
 # Used to generate images for traces

-gem "gd2-ffij"
+gem "bzip2-ffi"
+gem "ffi-libarchive"
+gem "gd2-ffij", ">= 0.4.0"
+gem "mimemagic"

 
 # Used for browser detection
 gem "browser"
 
 # Used for browser detection
 gem "browser"


@@ -139,6 +142,7 @@ group :test do
   gem "rails-controller-testing"
   gem "rubocop"
   gem "rubocop-performance"
   gem "rails-controller-testing"
   gem "rubocop"
   gem "rubocop-performance"

+  gem "rubocop-rails"

   gem "webmock"
 end
 
   gem "webmock"
 end