Merge pull request #733 from omu/develop

Merge develop into master

.browserslistrc

@@ -0,0 +1 @@
+> 1%

.gitignore

@@ -16,19 +16,30 @@
 /tmp/*
 !/log/.keep
 !/tmp/.keep
+
+# Ignore uploaded files in development.
+/storage/*
+!/storage/.keep
+
+/public/assets
+.byebug_history
+
+# Ignore master key for decrypting credentials and more.
+/config/master.key
+/public/packs
+/public/packs-test
 /node_modules
 /yarn-error.log
+yarn-debug.log*
+.yarn-integrity
+
+# Ignore local bundler directory
 /vendor/*
+
+# Ignore misc.
+/bin/dokku
 /coverage
-.byebug_history
 .vagrant*/
 .env
 .envrc
-/storage/*
 /.local/
-
-# never remove!
-config/master.key
-
-# Ignore misc.
-/bin/dokku

Gemfile

@@ -3,16 +3,13 @@
 source 'https://rubygems.org'
 ruby File.read('.ruby-version')
 
-git_source(:github) do |repo_name|
-  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?('/')
-  "https://github.com/#{repo_name}.git"
-end
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 # core
 gem 'bootsnap', '>= 1.1.0', require: false
 gem 'puma', '~> 3.11'
-gem 'rails', '~> 5.2.1'
-gem 'redis'
+gem 'rails', github: 'rails/rails'
+gem 'redis', '~> 4.0'
 gem 'sidekiq'
 
 # database
@@ -26,14 +23,17 @@ gem 'ancestry'
 
 # active-storage
 gem 'aws-sdk-s3', require: false
-gem 'image_processing', '~> 1.0'
+gem 'image_processing', '~> 1.2'
 
 # authentication
 gem 'devise'
 
 # assets: core asset dependencies
+# TODO: Edge versions require coffee-rails https://github.com/rails/rails/issues/28965
+gem 'coffee-rails', '~> 4.2'
 gem 'sassc-rails'
 gem 'uglifier', '>= 1.3.0'
+gem 'webpacker', github: 'rails/webpacker'
 
 # view helpers: tools for forms, views, etc.
 gem 'chartkick'
@@ -55,7 +55,7 @@ gem 'rack-attack'
 gem 'email_address'
 
 # error tracking
-gem 'rollbar'
+gem 'rollbar', github: 'rollbar/rollbar-gem'
 
 # permalinks
 gem 'friendly_id', '~> 5.2.0'
@@ -71,24 +71,26 @@ group :development, :test do
 end
 
 group :test do
-  gem 'capybara'
+  gem 'capybara', '>= 2.15'
   gem 'chromedriver-helper'
   gem 'codacy-coverage', require: false
   gem 'selenium-webdriver'
   gem 'webmock'
 end
 
 group :development do
-  gem 'bullet'
+  # TODO: Will re-enable after upgrading bullet.
+  # gem 'bullet'
   gem 'fit-commit'
   gem 'letter_opener'
   gem 'listen', '>= 3.0.5', '< 3.2'
   gem 'pry-rails'
-  gem 'rack-mini-profiler'
+  # TODO: Will re-enable after upgrading rack-mini-profiler
+  # gem 'rack-mini-profiler'
   gem 'ruby-progressbar'
   gem 'spring'
   gem 'spring-watcher-listen', '~> 2.0.0'
-  gem 'web-console', '>= 3.3.0' # call <%= console %> anywhere in the code.
+  gem 'web-console', github: 'rails/web-console'
 end
 
 # core plugins