Merge branch 'develop'

Author: ElliottAYoung

.env.example

@@ -15,6 +15,12 @@ S3_BUCKET_NAME=
 S3_PROTOCOL=
 S3_REGION=
 
+#
+# Monitoring
+#
+NEW_RELIC_LICENSE_KEY=
+SENTRY_RAVEN_DSN=
+
 #
 # Email Configuration
 #

Gemfile

@@ -5,10 +5,10 @@ ruby '2.4.0'
 gem 'bower-rails', '~> 0.11.0'
 
 # Server
-gem 'puma', '< 3.7' # Puma 3.7.0 breaks options passed in via `rails s` - will be fixed in 3.7.1
+gem 'puma', '~> 3.8.2'
 
 # Rails
-gem 'rails', '~> 5.0.1'
+gem 'rails', '~> 5.0.2'
 
 # Cortex-specific
 gem 'cortex-exceptions', '= 0.0.4'
@@ -17,12 +17,12 @@ gem 'cortex-plugins-core', '= 0.12.3'
 # API
 gem 'grape', '~> 0.17'
 gem 'grape-entity', '~> 0.6.0'
-gem 'grape-swagger', '~> 0.25.3'
+gem 'grape-swagger', '~> 0.27.1'
 
 # Authorization
 gem 'six', '~> 0.2.0'
-gem 'devise', '~> 4.2.0'
-gem 'rack-oauth2', '~> 1.5.1'
+gem 'devise', '~> 4.2.1'
+gem 'rack-oauth2', '~> 1.6.1'
 gem 'doorkeeper', '~> 4.2'
 gem 'rolify', '~> 5.1'
 gem 'pundit', '~> 1.1'
@@ -32,54 +32,54 @@ gem 'rails-observers', git: 'https://github.com/triloch/rails-observers.git'
 gem 'awesome_nested_set', git: 'https://github.com/cortex-cms/awesome_nested_set.git'
 gem 'paperclip', '~> 5.1.0'
 gem 'paperclip-optimizer', '~> 2.0'
-gem 'image_optim_pack', '~> 0.3.1'
+gem 'image_optim_pack', '~> 0.4.0'
 gem 'acts-as-taggable-on', '~> 4.0'
 gem 'bcrypt', '~> 3.1.11'
 gem 'kaminari', '~> 0.17.0'
 gem 'grape-kaminari', git: 'https://github.com/toastercup/grape-kaminari.git', branch: 'set-paginate-headers-extraction'
 gem 'elasticsearch-model', '~> 0.1'
 gem 'elasticsearch-rails', '~> 0.1'
-gem 'paranoia', '~> 2.2'
-gem 'pg', '~> 0.19.0'
+gem 'paranoia', '~> 2.3'
+gem 'pg', '~> 0.20.0'
 gem 'hashie-forbidden_attributes', '~> 0.1.1'
 gem 'redis-rails', '~> 5.0'
 gem 'pomona', '~> 0.7'
-gem 'transitions', '~> 1.2', :require => ['transitions', 'active_model/transitions']
+gem 'transitions', '~> 1.2', require: %w(transitions active_model/transitions)
 gem 'deep_cloneable', '~> 2.2.2'
 
 # Middleware
 gem 'rack-cors', '~> 0.4.1', require: 'rack/cors'
 
 # Utility
 gem 'excon', '~> 0.55.0'
-gem 'hashie', '~> 3.5.3'
-gem 'hashr', '~> 2.0.0'
+gem 'hashie', '~> 3.5.5'
+gem 'hashr', '~> 2.0.1'
 gem 'mime-types', '~> 3.1.0'
 gem 'interactor-rails', '~> 2.0'
 gem 'virtus', '~> 1.0.5'
 gem 'rubyzip', '~> 1.2.1'
-gem 'addressable', '~> 2.5.0'
+gem 'addressable', '~> 2.5.1'
 gem 'json'
 
 # External Services
-gem 'yt', '~> 0.28.5'
-gem 'aws-sdk', '~> 2.7' # Used by Paperclip
+gem 'yt', '~> 0.30.1'
+gem 'aws-sdk', '~> 2.9'
 
 # Jobs
-gem 'sidekiq', '~> 4.2.9'
-gem 'sidekiq-failures', '~> 0.4.5'
-gem 'sinatra', '~> 2.0.0.beta', require: false
+gem 'sidekiq', '~> 5.0.0'
+#gem 'sidekiq-failures', '~> 0.4.5' # Disabled until it supports sidekiq 5.x
+gem 'sinatra', '~> 2.0.0.rc', require: false
 
 # Pipeline
 gem 'sprockets-rails', '3.2.0', require: 'sprockets/railtie'
 gem 'sprockets', '3.7.1'
-gem 'uglifier', '~> 3.0.4'
+gem 'uglifier', '~> 3.2.0'
 gem 'non-stupid-digest-assets', '~> 1.0.9'
 gem 'angular-rails-templates', '~> 1.0.2'
 gem 'ngannotate-rails', '~> 1.2.2'
 
 # View
-gem 'haml', '~> 4.1.0.beta'
+gem 'haml', '~> 5.0'
 gem 'cells', '~> 4.1.6'
 gem 'cells-rails', '~> 0.0.7'
 gem 'cells-haml', '~> 0.0.10'
@@ -96,7 +96,7 @@ gem 'react_on_rails', '< 6.6'
 gem 'mini_racer', platforms: :ruby
 gem 'gon', '~> 6.1.0'
 gem 'turbolinks', '~> 5.0.1'
-gem 'jquery-rails', '~> 4.2.2'
+gem 'jquery-rails', '~> 4.3.1'
 gem 'jquery-turbolinks', '~> 2.1'
 gem 'jquery-ui-rails', '~> 6.0.1'
 gem 'ng-rails-csrf', '~> 0.1.0'
@@ -138,11 +138,11 @@ group :test do
   # Rspec
   gem 'rspec-rails', '~> 3.5'
   gem 'json_spec', '~> 1.1'
-  gem 'rspec-sidekiq', '~> 2.2'
+  gem 'rspec-sidekiq', '~> 3.0'
   gem 'shoulda-matchers', '~> 3.1'
 
   # Coverage
-  gem 'simplecov', '~> 0.13', require: false
+  gem 'simplecov', '~> 0.14', require: false
   gem 'codeclimate-test-reporter', '~> 0.6', require: false
 
   # Capybara for feature testing, Poltergeist for PhantomJS
@@ -169,14 +169,15 @@ end
 group :test, :development do
   gem 'factory_girl_rails', '~> 4.8'
   gem 'faker', '~> 1.7'
-  gem 'fog', '~> 1.38.0'
+  gem 'fog-local', '~> 0.3.1'
   gem 'phantomjs', '~> 2.1.1'
   gem 'jasmine-rails', '~> 0.14'
 end
 
 group :staging, :production do
   # Monitoring
-  gem 'newrelic_rpm', '~> 3.18'
+  gem 'newrelic_rpm'
+  gem 'sentry-raven'
 
   # Performance
   gem 'bootscale', require: false