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

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 96d696561129b4a13ede9d13635791b07dab79b6..b0b5f495019d7f5be2ffe6713a95ce822528032b 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 # Require rails
 source "https://rubygems.org"
 
 # Require rails

-gem "rails", "5.2.2"
+gem "rails", "5.2.2.1"

 
 # Require things which have moved to gems in ruby 1.9
 gem "bigdecimal", "~> 1.1.0", :platforms => :ruby_19
 
 # Require things which have moved to gems in ruby 1.9
 gem "bigdecimal", "~> 1.1.0", :platforms => :ruby_19


@@ -46,6 +46,7 @@ gem "image_optim_rails"
 # Load rails plugins
 gem "actionpack-page_caching"
 gem "active_record_union"
 # 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 "cancancan"
 gem "composite_primary_keys", "~> 11.1.0"
 gem "config"


@@ -143,6 +144,7 @@ end
 group :development, :test do
   gem "capybara", "~> 2.13"
   gem "coveralls", :require => false
 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"
   gem "factory_bot_rails"
   gem "jshint"
   gem "poltergeist"