diff --git a/Gemfile b/Gemfile index d322e9414..d7e77a6ac 100644 --- a/Gemfile +++ b/Gemfile @@ -5,10 +5,10 @@ ruby '2.3.1' gem 'bower-rails', '~> 0.11.0' # Server -gem 'unicorn', '~> 5.1.0' +gem 'unicorn', '~> 5.2.0' # Rails -gem 'rails', '~> 4.2.7' +gem 'rails', '~> 5.0.0' # Cortex-specific gem 'cortex-exceptions', '~> 0.0.4' @@ -18,7 +18,7 @@ gem 'cortex-plugins-demo', git: 'git://github.com/cortex-cms/cortex-plugins-demo # API gem 'grape', '~> 0.17' gem 'grape-entity', '~> 0.5.1' -gem 'grape-swagger', '~> 0.24.0' +gem 'grape-swagger', '~> 0.25.0' # Authorization gem 'six', '~> 0.2.0' @@ -29,7 +29,7 @@ gem 'rolify', '~> 5.1' gem 'pundit', '~> 1.1' # Data -gem 'rails-observers', '~> 0.1.2' +gem 'rails-observers', git: 'git://github.com/rails/rails-observers' gem 'awesome_nested_set', '~> 3.1' gem 'paperclip', '~> 5.1.0' gem 'paperclip-optimizer', '~> 2.0' @@ -39,42 +39,42 @@ gem 'bcrypt', '~> 3.1.11' gem 'grape-kaminari', git: 'git://github.com/toastercup/grape-kaminari', branch: 'set-only-pagination-headers' gem 'elasticsearch-model', '~> 0.1' gem 'elasticsearch-rails', '~> 0.1' -gem 'paranoia', '~> 2.1' +gem 'paranoia', '~> 2.2' gem 'pg', '~> 0.19.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 => ['transitions', 'active_model/transitions'] # Middleware gem 'rack-cors', '~> 0.4.0', require: 'rack/cors' # Utility -gem 'excon', '~> 0.52.0' +gem 'excon', '~> 0.54.0' gem 'hashie', '~> 3.4.6' gem 'hashr', '~> 2.0.0' gem 'mime-types', '~> 3.1.0' gem 'interactor-rails', '~> 2.0' gem 'virtus', '~> 1.0.5' gem 'rubyzip', '~> 1.2.0' -gem 'addressable', '~> 2.4.0' +gem 'addressable', '~> 2.5.0' gem 'json' # External Services -gem 'yt', '~> 0.25.40' +gem 'yt', '~> 0.28.1' gem 'aws-sdk', '~> 2.6' # Used by Paperclip # Jobs -gem 'sidekiq', '~> 4.2.1' +gem 'sidekiq', '~> 4.2.5' gem 'sidekiq-failures', '~> 0.4.5' -gem 'sinatra', '~> 1.4.7', require: false +gem 'sinatra', '~> 2.0.0.beta', require: false # Pipeline gem 'sprockets-rails', '3.2.0', :require => 'sprockets/railtie' gem 'sprockets', '3.7.0' gem 'angular-rails-templates', '~> 1.0.2' gem 'ngannotate-rails', '~> 1.2.2' -gem 'uglifier', '~> 3.0.2' +gem 'uglifier', '~> 3.0.3' # View gem 'haml', '~> 4.1.0.beta' @@ -88,7 +88,7 @@ gem 'bootstrap-tagsinput-rails', '~> 0.4.2' # Style gem 'sass-rails', '~> 5.0' gem 'bourbon', '~> 5.0.0.beta' -gem 'font-awesome-sass', '~> 4.6.2' +gem 'font-awesome-sass', '~> 4.7.0' gem 'material_design_lite-sass', '~> 1.2.1' # JavaScript @@ -105,10 +105,10 @@ end group :test, :development do # Environment - gem 'dotenv', '~> 2.1.1' + gem 'dotenv' # Cache/Sidekiq - gem 'redis-namespace', '~> 1.5' + gem 'redis-namespace' # Debug gem 'byebug' @@ -121,7 +121,7 @@ group :test, :development do gem 'pry-stack_explorer' # Documentation - gem "rails-erd" + gem 'rails-erd' end group :test do @@ -140,7 +140,7 @@ group :test do gem 'guard-rspec', '~> 4.7' # Mocking/Faking - gem 'mocha', '~> 1.1', require: false + gem 'mocha', '~> 1.2', require: false gem 'database_cleaner', '~> 1.5' gem 'timecop', '~> 0.8' gem 'email_spec' @@ -164,5 +164,5 @@ end group :staging, :production do # Monitoring - gem 'newrelic_rpm', '~> 3.16' + gem 'newrelic_rpm', '~> 3.17' end diff --git a/Gemfile.lock b/Gemfile.lock index e9dedef67..896d35e29 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,6 +8,13 @@ GIT cells-rails (~> 0.0.6) rails (>= 4) +GIT + remote: git://github.com/rails/rails-observers + revision: 3fe157d6cbb5b5e767ded248009fc59443d63fa1 + specs: + rails-observers (0.1.3.alpha) + activemodel (>= 4.0, < 5.1) + GIT remote: git://github.com/samstickland/cells revision: e5634e25b472d41913030eb82463b015f429f2ca @@ -30,61 +37,64 @@ GEM remote: https://rubygems.org/ specs: CFPropertyList (2.3.3) - actionmailer (4.2.7.1) - actionpack (= 4.2.7.1) - actionview (= 4.2.7.1) - activejob (= 4.2.7.1) + actioncable (5.0.0.1) + actionpack (= 5.0.0.1) + nio4r (~> 1.2) + websocket-driver (~> 0.6.1) + actionmailer (5.0.0.1) + actionpack (= 5.0.0.1) + actionview (= 5.0.0.1) + activejob (= 5.0.0.1) mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.7.1) - actionview (= 4.2.7.1) - activesupport (= 4.2.7.1) - rack (~> 1.6) - rack-test (~> 0.6.2) - rails-dom-testing (~> 1.0, >= 1.0.5) + rails-dom-testing (~> 2.0) + actionpack (5.0.0.1) + actionview (= 5.0.0.1) + activesupport (= 5.0.0.1) + rack (~> 2.0) + rack-test (~> 0.6.3) + rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.7.1) - activesupport (= 4.2.7.1) + actionview (5.0.0.1) + activesupport (= 5.0.0.1) builder (~> 3.1) erubis (~> 2.7.0) - rails-dom-testing (~> 1.0, >= 1.0.5) + rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - activejob (4.2.7.1) - activesupport (= 4.2.7.1) - globalid (>= 0.3.0) - activemodel (4.2.7.1) - activesupport (= 4.2.7.1) - builder (~> 3.1) - activerecord (4.2.7.1) - activemodel (= 4.2.7.1) - activesupport (= 4.2.7.1) - arel (~> 6.0) - activesupport (4.2.7.1) + activejob (5.0.0.1) + activesupport (= 5.0.0.1) + globalid (>= 0.3.6) + activemodel (5.0.0.1) + activesupport (= 5.0.0.1) + activerecord (5.0.0.1) + activemodel (= 5.0.0.1) + activesupport (= 5.0.0.1) + arel (~> 7.0) + activesupport (5.0.0.1) + concurrent-ruby (~> 1.0, >= 1.0.2) i18n (~> 0.7) - json (~> 1.7, >= 1.7.7) minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) acts-as-taggable-on (4.0.0) activerecord (>= 4.0) - addressable (2.4.0) + addressable (2.5.0) + public_suffix (~> 2.0, >= 2.0.2) angular-rails-templates (1.0.2) railties (>= 4.2, < 6) sprockets (>= 3.0, < 5) tilt ansi (1.5.0) - arel (6.0.3) + arel (7.1.4) attr_required (1.0.1) - autoprefixer-rails (6.5.1) + autoprefixer-rails (6.5.3) execjs awesome_nested_set (3.1.1) activerecord (>= 4.0.0, < 5.1) - aws-sdk (2.6.12) - aws-sdk-resources (= 2.6.12) - aws-sdk-core (2.6.12) + aws-sdk (2.6.19) + aws-sdk-resources (= 2.6.19) + aws-sdk-core (2.6.19) jmespath (~> 1.0) - aws-sdk-resources (2.6.12) - aws-sdk-core (= 2.6.12) + aws-sdk-resources (2.6.19) + aws-sdk-core (= 2.6.19) axiom-types (0.1.1) descendants_tracker (~> 0.0.4) ice_nine (~> 0.11.0) @@ -98,7 +108,7 @@ GEM debug_inspector (>= 0.0.1) bootstrap-tagsinput-rails (0.4.2.1) railties (>= 3.1) - bourbon (5.0.0.beta.6) + bourbon (5.0.0.beta.7) sass (~> 3.4.22) thor (~> 0.19.1) bower-rails (0.11.0) @@ -159,10 +169,10 @@ GEM doorkeeper (4.2.0) railties (>= 4.2) dotenv (2.1.1) - elasticsearch (2.0.0) - elasticsearch-api (= 2.0.0) - elasticsearch-transport (= 2.0.0) - elasticsearch-api (2.0.0) + elasticsearch (5.0.0) + elasticsearch-api (= 5.0.0) + elasticsearch-transport (= 5.0.0) + elasticsearch-api (5.0.0) multi_json elasticsearch-extensions (0.0.22) ansi @@ -172,16 +182,17 @@ GEM elasticsearch (> 0.4) hashie elasticsearch-rails (0.1.9) - elasticsearch-transport (2.0.0) + elasticsearch-transport (5.0.0) faraday multi_json email_spec (2.1.0) htmlentities (~> 4.3.3) launchy (~> 2.1) mail (~> 2.6.3) + enumerable-lazy (0.0.2) equalizer (0.0.11) erubis (2.7.0) - excon (0.52.0) + excon (0.54.0) execjs (2.7.0) exifr (1.2.5) factory_girl (4.7.0) @@ -191,7 +202,7 @@ GEM railties (>= 3.0.0) faker (1.6.6) i18n (~> 0.5) - faraday (0.9.2) + faraday (0.10.0) multipart-post (>= 1.2, < 3) ffi (1.9.14) fission (0.5.0) @@ -265,9 +276,9 @@ GEM fog-json (1.0.2) fog-core (~> 1.0) multi_json (~> 1.10) - fog-local (0.3.0) + fog-local (0.3.1) fog-core (~> 1.27) - fog-openstack (0.1.15) + fog-openstack (0.1.17) fog-core (>= 1.40) fog-json (>= 1.0) ipaddress (>= 0.8) @@ -275,10 +286,10 @@ GEM fog-core (~> 1.27) fog-json (~> 1.0) fog-xml (~> 0.1) - fog-profitbricks (2.0.1) + fog-profitbricks (3.0.0) fog-core (~> 1.42) fog-json (~> 1.0) - fog-rackspace (0.1.1) + fog-rackspace (0.1.2) fog-core (>= 1.35) fog-json (>= 1.0) fog-xml (>= 0.1) @@ -312,7 +323,7 @@ GEM fog-voxel (0.1.0) fog-core fog-xml - fog-vsphere (1.4.0) + fog-vsphere (1.5.1) fog-core rbvmomi (~> 1.9) fog-xenserver (0.2.3) @@ -321,7 +332,7 @@ GEM fog-xml (0.1.2) fog-core nokogiri (~> 1.5, >= 1.5.11) - font-awesome-sass (4.6.2) + font-awesome-sass (4.7.0) sass (>= 3.2) formatador (0.2.5) fspath (3.0.1) @@ -332,20 +343,20 @@ GEM json multi_json request_store (>= 1.0) - grape (0.18.0) + grape (0.17.0) activesupport builder hashie (>= 2.1.0) multi_json (>= 1.3.2) multi_xml (>= 0.5.2) - mustermann-grape (~> 0.4.0) + mustermann19 (~> 0.4.3) rack (>= 1.3.0) rack-accept virtus (>= 1.0.0) grape-entity (0.5.1) activesupport multi_json (>= 1.3.2) - grape-swagger (0.24.0) + grape-swagger (0.25.0) grape (>= 0.12.0) guard (2.14.0) formatador (>= 0.2.4) @@ -385,7 +396,7 @@ GEM image_size (~> 1.3) in_threads (~> 1.3) progress (~> 3.0, >= 3.0.1) - image_optim_pack (0.3.0.20161021) + image_optim_pack (0.3.0.20161108) fspath (>= 2.1, < 4) image_optim (~> 0.19) image_size (1.4.2) @@ -417,7 +428,7 @@ GEM turbolinks jquery-ui-rails (5.0.5) railties (>= 3.2.16) - json (1.8.3) + json (2.0.2) json_spec (1.1.4) multi_json (~> 1.0) rspec (>= 2.0, < 4.0) @@ -452,16 +463,16 @@ GEM multi_json (1.12.1) multi_xml (0.5.5) multipart-post (2.0.0) - mustermann (0.4.0) - tool (~> 0.2) - mustermann-grape (0.4.0) - mustermann (= 0.4.0) + mustermann (1.0.0.beta2) + mustermann19 (0.4.4) + enumerable-lazy nenv (0.3.0) - newrelic_rpm (3.17.0.325) + newrelic_rpm (3.17.1.326) ng-rails-csrf (0.1.0) ngannotate-rails (1.2.2) execjs rails (>= 3.1) + nio4r (1.2.1) nokogiri (1.6.8.1) mini_portile2 (~> 2.1.0) notiffany (0.1.1) @@ -504,9 +515,10 @@ GEM pry-stack_explorer (0.4.9.2) binding_of_caller (>= 0.7) pry (>= 0.9.11) + public_suffix (2.0.4) pundit (1.1.0) activesupport (>= 3.0.0) - rack (1.6.4) + rack (2.0.1) rack-accept (0.4.5) rack (>= 0.4) rack-cors (0.4.0) @@ -516,27 +528,25 @@ GEM httpclient (>= 2.4) multi_json (>= 1.3.6) rack (>= 1.1) - rack-protection (1.5.3) + rack-protection (2.0.0.beta2) rack rack-test (0.6.3) rack (>= 1.0) - rails (4.2.7.1) - actionmailer (= 4.2.7.1) - actionpack (= 4.2.7.1) - actionview (= 4.2.7.1) - activejob (= 4.2.7.1) - activemodel (= 4.2.7.1) - activerecord (= 4.2.7.1) - activesupport (= 4.2.7.1) + rails (5.0.0.1) + actioncable (= 5.0.0.1) + actionmailer (= 5.0.0.1) + actionpack (= 5.0.0.1) + actionview (= 5.0.0.1) + activejob (= 5.0.0.1) + activemodel (= 5.0.0.1) + activerecord (= 5.0.0.1) + activesupport (= 5.0.0.1) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.7.1) - sprockets-rails - rails-deprecated_sanitizer (1.0.3) - activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.7) - activesupport (>= 4.2.0.beta, < 5.0) + railties (= 5.0.0.1) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.1) + activesupport (>= 4.2.0, < 6.0) nokogiri (~> 1.6.0) - rails-deprecated_sanitizer (>= 1.0.1) rails-erd (1.5.0) activerecord (>= 3.2) activesupport (>= 3.2) @@ -544,16 +554,15 @@ GEM ruby-graphviz (~> 1.2) rails-html-sanitizer (1.0.3) loofah (~> 2.0) - rails-observers (0.1.2) - activemodel (~> 4.0) - railties (4.2.7.1) - actionpack (= 4.2.7.1) - activesupport (= 4.2.7.1) + railties (5.0.0.1) + actionpack (= 5.0.0.1) + activesupport (= 5.0.0.1) + method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) raindrops (0.17.0) rake (11.3.0) - rb-fsevent (0.9.7) + rb-fsevent (0.9.8) rb-inotify (0.9.7) ffi (>= 0.5.0) rbvmomi (1.9.4) @@ -562,18 +571,18 @@ GEM nokogiri (~> 1.5) trollop (~> 2.1) redis (3.3.1) - redis-actionpack (5.0.0) - actionpack (>= 4.0.0, < 6) - redis-rack (~> 2.0.0.pre) - redis-store (~> 1.2.0.pre) + redis-actionpack (5.0.1) + actionpack (>= 4.0, < 6) + redis-rack (>= 1, < 3) + redis-store (>= 1.1.0, < 1.4.0) redis-activesupport (5.0.1) activesupport (>= 3, < 6) redis-store (~> 1.2.0) redis-namespace (1.5.2) redis (~> 3.0, >= 3.0.4) - redis-rack (2.0.0.pre) - rack (> 1.5, < 3) - redis-store (~> 1.2.0.pre) + redis-rack (2.0.0) + rack (~> 2.0) + redis-store (~> 1.2.0) redis-rails (5.0.1) redis-actionpack (~> 5.0.0) redis-activesupport (~> 5.0.0) @@ -622,7 +631,7 @@ GEM shellany (0.0.1) shoulda-matchers (3.1.1) activesupport (>= 4.0.0) - sidekiq (4.2.3) + sidekiq (4.2.5) concurrent-ruby (~> 1.0) connection_pool (~> 2.2, >= 2.2.0) rack-protection (>= 1.5.0) @@ -634,10 +643,11 @@ GEM json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.0) - sinatra (1.4.7) - rack (~> 1.5) - rack-protection (~> 1.4) - tilt (>= 1.3, < 3) + sinatra (2.0.0.beta2) + mustermann (= 1.0.0.beta2) + rack (~> 2.0) + rack-protection (= 2.0.0.beta2) + tilt (~> 2.0) six (0.2.0) slop (3.6.0) sprockets (3.7.0) @@ -651,18 +661,17 @@ GEM thread_safe (0.3.5) tilt (2.0.5) timecop (0.8.1) - tool (0.2.3) - transitions (1.2.0) + transitions (1.2.1) trollop (2.1.2) turbolinks (5.0.1) turbolinks-source (~> 5) turbolinks-source (5.0.0) tzinfo (1.2.2) thread_safe (~> 0.1) - uber (0.0.15) - uglifier (3.0.2) + uber (0.1.0) + uglifier (3.0.3) execjs (>= 0.3.0, < 3) - unicorn (5.1.0) + unicorn (5.2.0) kgio (~> 2.6) raindrops (~> 0.7) virtus (1.0.5) @@ -679,7 +688,7 @@ GEM xpath (2.0.0) nokogiri (~> 1.3) yard (0.9.5) - yt (0.25.40) + yt (0.28.1) activesupport PLATFORMS @@ -687,7 +696,7 @@ PLATFORMS DEPENDENCIES acts-as-taggable-on (~> 4.0) - addressable (~> 2.4.0) + addressable (~> 2.5.0) angular-rails-templates (~> 1.0.2) awesome_nested_set (~> 3.1) aws-sdk (~> 2.6) @@ -710,21 +719,21 @@ DEPENDENCIES database_cleaner (~> 1.5) devise (~> 4.2.0) doorkeeper (~> 4.2) - dotenv (~> 2.1.1) + dotenv elasticsearch-extensions (~> 0.0.22) elasticsearch-model (~> 0.1) elasticsearch-rails (~> 0.1) email_spec - excon (~> 0.52.0) + excon (~> 0.54.0) factory_girl_rails (~> 4.7) faker (~> 1.6) fog (~> 1.38.0) - font-awesome-sass (~> 4.6.2) + font-awesome-sass (~> 4.7.0) gon (~> 6.1.0) grape (~> 0.17) grape-entity (~> 0.5.1) grape-kaminari! - grape-swagger (~> 0.24.0) + grape-swagger (~> 0.25.0) guard-jasmine (~> 2.1) guard-rspec (~> 4.7) haml (~> 4.1.0.beta) @@ -742,14 +751,14 @@ DEPENDENCIES json_spec (~> 1.1) material_design_lite-sass (~> 1.2.1) mime-types (~> 3.1.0) - mocha (~> 1.1) - newrelic_rpm (~> 3.16) + mocha (~> 1.2) + newrelic_rpm (~> 3.17) ng-rails-csrf (~> 0.1.0) ngannotate-rails (~> 1.2.2) nokogiri paperclip (~> 5.1.0) paperclip-optimizer (~> 2.0) - paranoia (~> 2.1) + paranoia (~> 2.2) pg (~> 0.19.0) phantomjs (~> 2.1.1) poltergeist @@ -762,10 +771,10 @@ DEPENDENCIES pundit (~> 1.1) rack-cors (~> 0.4.0) rack-oauth2 (~> 1.4.0) - rails (~> 4.2.7) + rails (~> 5.0.0) rails-erd - rails-observers (~> 0.1.2) - redis-namespace (~> 1.5) + rails-observers! + redis-namespace redis-rails (~> 5.0) rolify (~> 5.1) rspec (~> 3.5) @@ -774,19 +783,19 @@ DEPENDENCIES rubyzip (~> 1.2.0) sass-rails (~> 5.0) shoulda-matchers (~> 3.1) - sidekiq (~> 4.2.1) + sidekiq (~> 4.2.5) sidekiq-failures (~> 0.4.5) - sinatra (~> 1.4.7) + sinatra (~> 2.0.0.beta) six (~> 0.2.0) sprockets (= 3.7.0) sprockets-rails (= 3.2.0) timecop (~> 0.8) transitions (~> 1.2) turbolinks (~> 5.0.1) - uglifier (~> 3.0.2) - unicorn (~> 5.1.0) + uglifier (~> 3.0.3) + unicorn (~> 5.2.0) virtus (~> 1.0.5) - yt (~> 0.25.40) + yt (~> 0.28.1) RUBY VERSION ruby 2.3.1p112 diff --git a/config/application.rb b/config/application.rb index e30d86c9d..2199c9e77 100644 --- a/config/application.rb +++ b/config/application.rb @@ -35,9 +35,6 @@ class Application < Rails::Application generator.orm :active_record end - # Do not swallow errors in after_commit/after_rollback callbacks. - config.active_record.raise_in_transactional_callbacks = true - # Needed until there is a better fix for Paperclip. https://github.com/thoughtbot/paperclip/issues/1924#issuecomment-123927367 Paperclip.options[:content_type_mappings] = {:csv => 'text/plain'} end