Merge branch 'release-2.1.0.6'

.gitignore

@@ -3,7 +3,7 @@
 .DS_Store
 .bundle
 .rvmrc
-bin
+bin/camp-restart-hook.sh
 config/initializers/tagteam_shared_key.rb
 config/database.yml
 config/sunspot.yml
@@ -15,7 +15,7 @@ log/
 nginx/
 pgsql/
 redis/
-solr/data/*
+solr/*/data/
 solr/pids/
 ./tags
 tmp/

.rubocop.yml

@@ -7,4 +7,7 @@ Metrics/LineLength:
 Rails:
   Enabled: true
 AllCops:
-  TargetRubyVersion: 2.3
+  Exclude:
+    - 'db/**/*'
+  TargetRubyVersion: 2.4
+  TargetRailsVersion: 5.1

.ruby-version

@@ -0,0 +1 @@
+2.4.1

Gemfile

@@ -2,81 +2,86 @@
 
 source 'http://rubygems.org'
 
-ruby '2.3.0'
+ruby '2.4.1'
 
 gem 'acl9', '~> 3.1'
 gem 'actionpack-action_caching', '~> 1.2'
-gem 'active_interaction', '~> 3.5'
-gem 'acts-as-taggable-on', '~> 4.0'
-gem 'acts_as_api', '~> 0.4'
+gem 'active_interaction', '~> 3.6'
+gem 'acts-as-taggable-on', '~> 5.0'
+gem 'acts_as_api', '~> 1.0'
+gem 'bootsnap', '~> 1.3', require: false
 gem 'bootstrap-sass', '~> 3.3'
 gem 'breadcrumbs', '~> 0.1'
-gem 'browser', '~> 2.4'
-gem 'devise', '~> 4.2'
-gem 'exception_notification', '~> 2.6'
+gem 'browser', '~> 2.5'
+gem 'devise', '~> 4.4'
+gem 'exception_notification', '~> 4.2'
 gem 'feed-abstract', '0.0.15'
 gem 'font-awesome-rails', '~> 4.7'
 gem 'formtastic', '~> 3.1'
 gem 'formtastic-bootstrap', git: 'https://github.com/mjbellantoni/formtastic-bootstrap.git'
 gem 'friendly_id', '~> 5.2'
-gem 'haml-rails', '~> 0.9'
-gem 'jquery-rails', '~> 4.2'
+gem 'haml-rails', '~> 1.0'
+gem 'jquery-rails', '~> 4.3'
+gem 'mail', '~> 2.7'
 gem 'nokogiri', '~> 1.8'
-gem 'non-stupid-digest-assets', '~> 1.0', '>= 1.0.9'
-gem 'pg', '~> 0.19'
-gem 'progress_bar', '~> 1.1'
-gem 'protected_attributes_continued', '~> 1.2' # TODO: switch to strong parameters
+gem 'non-stupid-digest-assets', '~> 1.0'
+gem 'pg', '~> 1.0'
+gem 'progress_bar', '~> 1.2'
+gem 'protected_attributes_continued', '~> 1.3' # TODO: switch to strong parameters
 gem 'pundit', '~> 1.1'
-gem 'rails', '~> 5.0'
-gem 'rails-observers', git: 'https://github.com/rails/rails-observers.git'
-gem 'sanitize', '~> 4.4'
+gem 'rails', '~> 5.1.0' # @drg frozen
+gem 'rails-observers', '~> 0.1'
+gem 'redis-namespace', '~> 1.6'
+gem 'sanitize', '~> 4.6'
 gem 'sass-rails', '~> 5.0'
-gem 'sidekiq', '~> 3.5'
-gem 'sinatra', '~> 2.0.0.beta2', require: false
+gem 'sidekiq', '~> 5.1'
+gem 'sinatra', '~> 2.0', require: false
 gem 'sprockets', '~> 3.7'
-gem 'sunspot_rails', '~> 2.2'
-gem 'sunspot_solr', '~> 2.2'
+# TODO: resolve errors when upgrading sunspot_rails/sunspot_solr from these pinned versions
+gem 'sunspot_rails', '2.2.7' # @drg frozen
+gem 'sunspot_solr', '2.2.0' # @drg frozen
 gem 'test-unit', '~> 3.2'
-gem 'uglifier', '~> 3.2'
-gem 'unicorn', '~> 4.9'
-gem 'whenever', '~> 0.9'
+gem 'uglifier', '~> 4.1'
+gem 'unicorn', '~> 5.4'
+gem 'whenever', '~> 0.10'
 gem 'will_paginate', '~> 3.1'
 gem 'will_paginate-bootstrap', '~> 1.0'
 
 group :development do
-  gem 'brakeman', '~> 3.6'
+  gem 'brakeman', '~> 4.3'
   gem 'drg', '~> 1.5'
-  gem 'haml_lint', '~> 0.26'
-  gem 'rubocop', '~> 0.49'
-  gem 'rubocop-rspec', '~> 1.15'
+  gem 'haml_lint', '~> 0.27'
+  gem 'listen', '~> 3.1'
+  gem 'rubocop', '~> 0.57'
+  gem 'rubocop-rspec', '~> 1.26'
   gem 'spring', '~> 2.0'
   gem 'spring-commands-rspec', '~> 1.0'
   gem 'spring-commands-rubocop', '~> 0.2'
-  gem 'web-console', '~> 3.4'
+  gem 'web-console', '~> 3.6'
 end
 
 group :development, :test do
-  gem 'awesome_print', '~> 1.7'
-  gem 'byebug', '~> 9.1'
-  gem 'pry', '~> 0.10'
-  gem 'pry-byebug', '~> 3.4'
+  gem 'awesome_print', '~> 1.8'
+  gem 'byebug', '~> 10.0'
+  gem 'pry', '~> 0.11'
+  gem 'pry-byebug', '~> 3.6'
   gem 'pry-rails', '~> 0.3'
-  gem 'rspec-rails', '~> 3.5'
+  gem 'rspec-rails', '~> 3.7'
   gem 'sqlite3', '~> 1.3'
   gem 'therubyracer', '~> 0.12'
 end
 
 group :test do
-  gem 'capybara-webkit', '~> 1.12'
-  gem 'database_cleaner', '~> 1.5'
-  gem 'factory_bot_rails', '~> 4.8'
-  gem 'fuubar', '~> 2.2'
+  gem 'capybara-webkit', '~> 1.15'
+  gem 'database_cleaner', '~> 1.7'
+  gem 'factory_bot_rails', '~> 4.10'
+  gem 'fuubar', '~> 2.3'
   gem 'headless', '~> 2.3'
   gem 'launchy', '~> 2.4'
-  gem 'pundit-matchers', '~> 1.1'
+  gem 'pundit-matchers', '~> 1.6'
   gem 'selenium-client', '~> 1.2'
-  gem 'selenium-webdriver', '~> 3.0'
+  gem 'selenium-webdriver', '~> 3.12'
   gem 'shoulda-matchers', '~> 3.1'
-  gem 'vcr', '~> 3.0'
-  gem 'webmock', '~> 2.3'
+  gem 'vcr', '~> 4.0'
+  gem 'webmock', '~> 3.4'
 end