1 files changed, 121 insertions, 78 deletions
diff --git a/Gemfile b/Gemfile
index 2fdcec062c..5d75457870 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,127 +1,170 @@
-source 'https://rubygems.org'
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 gemspec
 
 # We need a newish Rake since Active Job sets its test tasks' descriptions.
-gem 'rake', '>= 10.3'
+gem "rake", ">= 11.1"
+
+# This needs to be with require false to ensure correct loading order, as it has to
+# be loaded after loading the test library.
+gem "mocha", require: false
 
-# This needs to be with require false as it is
-# loaded after loading the test library to
-# ensure correct loading order
-gem 'mocha', '~> 0.14', require: false
+gem "capybara", "~> 2.15"
 
-gem 'rack-cache', '~> 1.2'
-gem 'jquery-rails', github: 'rails/jquery-rails', branch: 'master'
-gem 'coffee-rails', '~> 4.1.0'
-gem 'turbolinks'
-gem 'arel', github: 'rails/arel', branch: 'master'
-gem 'mail', github: 'mikel/mail'
+gem "rack-cache", "~> 1.2"
+gem "coffee-rails"
+gem "sass-rails"
+gem "turbolinks", "~> 5"
 
 # require: false so bcrypt is loaded only when has_secure_password is used.
-# This is to avoid ActiveModel (and by extension the entire framework)
+# This is to avoid Active Model (and by extension the entire framework)
 # being dependent on a binary library.
-gem 'bcrypt', '~> 3.1.7', require: false
+gem "bcrypt", "~> 3.1.11", require: false
+
+# This needs to be with require false to avoid it being automatically loaded by
+# sprockets.
+gem "uglifier", ">= 1.3.0", require: false
+
+# Explicitly avoid 1.x that doesn't support Ruby 2.4+
+gem "json", ">= 2.0.0"
+
+gem "rubocop", ">= 0.47", require: false
 
-# This needs to be with require false to avoid
-# it being automatically loaded by sprockets
-gem 'uglifier', '>= 1.3.0', require: false
+# https://github.com/guard/rb-inotify/pull/79
+gem "rb-inotify", github: "matthewd/rb-inotify", branch: "close-handling", require: false
+
+# https://github.com/puma/puma/pull/1345
+gem "stopgap_13632", platforms: :mri if RUBY_VERSION == "2.2.8"
 
 group :doc do
-  gem 'sdoc', '~> 0.4.0'
-  gem 'redcarpet', '~> 3.2.2', platforms: :ruby
-  gem 'w3c_validators'
-  gem 'kindlerb', '0.1.1'
+  gem "sdoc", github: "robin850/sdoc", branch: "upgrade"
+  gem "redcarpet", "~> 3.2.3", platforms: :ruby
+  gem "w3c_validators"
+  gem "kindlerb", "~> 1.2.0"
 end
 
-# ActiveSupport
-gem 'dalli', '>= 2.2.1'
+# Active Support.
+gem "dalli", ">= 2.2.1"
+gem "listen", ">= 3.0.5", "< 3.2", require: false
+gem "libxml-ruby", platforms: :ruby
+
+# for railties app_generator_test
+gem "bootsnap", ">= 1.1.0", require: false
 
-# ActiveJob
+# Active Job.
 group :job do
-  gem 'resque', require: false
-  gem 'resque-scheduler', require: false
-  gem 'sidekiq', require: false
-  gem 'sucker_punch', require: false
-  gem 'delayed_job', require: false
-  gem 'queue_classic', require: false, platforms: :ruby
-  gem 'sneakers', '0.1.1.pre', require: false
-  gem 'que', require: false
-  gem 'backburner', require: false
-  gem 'qu-rails', github: "bkeepers/qu", branch: "master", require: false
-  gem 'qu-redis', require: false
-  gem 'delayed_job_active_record', require: false
-  gem 'sequel', require: false
+  gem "resque", require: false
+  gem "resque-scheduler", require: false
+  gem "sidekiq", require: false
+  gem "sucker_punch", require: false
+  gem "delayed_job", require: false
+  gem "queue_classic", github: "QueueClassic/queue_classic", branch: "master", require: false, platforms: :ruby
+  gem "sneakers", require: false
+  gem "que", require: false
+  gem "backburner", require: false
+  # TODO: add qu after it support Rails 5.1
+  # gem 'qu-rails', github: "bkeepers/qu", branch: "master", require: false
+  # gem "qu-redis", require: false
+  gem "delayed_job_active_record", require: false
+  gem "sequel", require: false
+end
+
+# Action Cable
+group :cable do
+  gem "puma", require: false
+
+  gem "hiredis", require: false
+  gem "redis", "~> 4.0", require: false
+
+  gem "redis-namespace"
+
+  gem "websocket-client-simple", github: "matthewd/websocket-client-simple", branch: "close-race", require: false
+
+  gem "blade", require: false, platforms: [:ruby]
+  gem "blade-sauce_labs_plugin", require: false, platforms: [:ruby]
+  gem "sprockets-export", require: false
+end
+
+# Active Storage
+group :storage do
+  gem "aws-sdk-s3", require: false
+  gem "google-cloud-storage", "~> 1.8", require: false
+  gem "azure-storage", require: false
+
+  gem "mini_magick"
 end
 
-# Add your own local bundler stuff
-local_gemfile = File.dirname(__FILE__) + "/.Gemfile"
+group :ujs do
+  gem "qunit-selenium"
+  gem "chromedriver-helper"
+end
+
+# Add your own local bundler stuff.
+local_gemfile = File.expand_path(".Gemfile", __dir__)
 instance_eval File.read local_gemfile if File.exist? local_gemfile
 
 group :test do
-  # FIX: Our test suite isn't ready to run in random order yet
-  gem 'minitest', '< 5.3.4'
+  gem "minitest", "~> 5.10.0"
+  gem "minitest-bisect"
 
-  platforms :mri_19 do
-    gem 'ruby-prof', '~> 0.11.2'
+  platforms :mri do
+    gem "stackprof"
+    gem "byebug"
   end
 
-  platforms :mri_21, :mri_22 do
-    gem 'stackprof'
-  end
-
-  # platforms :mri do
-  #   gem 'byebug'
-  # end
-
-  gem 'benchmark-ips'
+  gem "benchmark-ips"
 end
 
-platforms :ruby do
-  gem 'nokogiri', '>= 1.4.5'
+platforms :ruby, :mswin, :mswin64, :mingw, :x64_mingw do
+  gem "nokogiri", ">= 1.8.1"
 
-  # Needed for compiling the ActionDispatch::Journey parser
-  gem 'racc', '>=1.4.6', require: false
+  # Needed for compiling the ActionDispatch::Journey parser.
+  gem "racc", ">=1.4.6", require: false
 
-  # ActiveRecord
-  gem 'sqlite3', '~> 1.3.6'
+  # Active Record.
+  gem "sqlite3", "~> 1.3.6"
 
   group :db do
-    gem 'pg', '>= 0.18.0'
-    gem 'mysql', '>= 2.9.0'
-    gem 'mysql2', '>= 0.3.18'
+    gem "pg", ">= 0.18.0"
+    gem "mysql2", ">= 0.4.4"
   end
 end
 
 platforms :jruby do
-  gem 'json'
-  if ENV['AR_JDBC']
-    gem 'activerecord-jdbcsqlite3-adapter', github: 'jruby/activerecord-jdbc-adapter', branch: 'master'
+  if ENV["AR_JDBC"]
+    gem "activerecord-jdbcsqlite3-adapter", github: "jruby/activerecord-jdbc-adapter", branch: "master"
     group :db do
-      gem 'activerecord-jdbcmysql-adapter', github: 'jruby/activerecord-jdbc-adapter', branch: 'master'
-      gem 'activerecord-jdbcpostgresql-adapter', github: 'jruby/activerecord-jdbc-adapter', branch: 'master'
+      gem "activerecord-jdbcmysql-adapter", github: "jruby/activerecord-jdbc-adapter", branch: "master"
+      gem "activerecord-jdbcpostgresql-adapter", github: "jruby/activerecord-jdbc-adapter", branch: "master"
     end
   else
-    gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0'
+    gem "activerecord-jdbcsqlite3-adapter", ">= 1.3.0"
     group :db do
-      gem 'activerecord-jdbcmysql-adapter', '>= 1.3.0'
-      gem 'activerecord-jdbcpostgresql-adapter', '>= 1.3.0'
+      gem "activerecord-jdbcmysql-adapter", ">= 1.3.0"
+      gem "activerecord-jdbcpostgresql-adapter", ">= 1.3.0"
     end
   end
 end
 
 platforms :rbx do
-  # The rubysl-yaml gem doesn't ship with Psych by default
-  # as it needs libyaml that isn't always available.
-  gem 'psych', '~> 2.0'
+  # The rubysl-yaml gem doesn't ship with Psych by default as it needs
+  # libyaml that isn't always available.
+  gem "psych", "~> 2.0"
 end
 
-# gems that are necessary for ActiveRecord tests with Oracle database
-if ENV['ORACLE_ENHANCED']
+# Gems that are necessary for Active Record tests with Oracle.
+if ENV["ORACLE_ENHANCED"]
   platforms :ruby do
-    gem 'ruby-oci8', '~> 2.1'
+    gem "ruby-oci8", "~> 2.2"
   end
-  gem 'activerecord-oracle_enhanced-adapter', github: 'rsim/oracle-enhanced', branch: 'master'
+  gem "activerecord-oracle_enhanced-adapter", github: "rsim/oracle-enhanced", branch: "master"
 end
 
-# A gem necessary for ActiveRecord tests with IBM DB
-gem 'ibm_db' if ENV['IBM_DB']
+# A gem necessary for Active Record tests with IBM DB.
+gem "ibm_db" if ENV["IBM_DB"]
+gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+gem "wdm", ">= 0.1.0", platforms: [:mingw, :mswin, :x64_mingw, :mswin64]