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

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index f2e1e21218c60c2324c593ae2ca454ce8185dfe0..b0b5f495019d7f5be2ffe6713a95ce822528032b 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -46,8 +46,10 @@ gem "image_optim_rails"
 # Load rails plugins
 gem "actionpack-page_caching"
 gem "active_record_union"
+gem "activerecord-import"
 gem "cancancan"
 gem "composite_primary_keys", "~> 11.1.0"
+gem "config"
 gem "delayed_job_active_record"
 gem "dynamic_form"
 gem "http_accept_language", "~> 2.0.0"
@@ -142,6 +144,7 @@ end
 group :development, :test do
   gem "capybara", "~> 2.13"
   gem "coveralls", :require => false
+  gem "erb_lint", :require => false
   gem "factory_bot_rails"
   gem "jshint"
   gem "poltergeist"