diff --git a/Gemfile b/Gemfile index 14a96e6f5a19..1c4b1a37a49c 100644 --- a/Gemfile +++ b/Gemfile @@ -4,45 +4,24 @@ source 'https://rubygems.org' ruby "2.4.4" git_source(:github) { |repo_name| "https://github.com/#{repo_name}.git" } -plugin 'bootboot', '~> 0.1.1' unless Bundler.settings[:frozen] -Plugin.__send__(:load_plugin, 'bootboot') if Plugin.installed?('bootboot') +gem 'rails', '~> 5.0.0' -if ENV['DEPENDENCIES_NEXT'] - enable_dual_booting if Plugin.installed?('bootboot') - - # This will only be loaded when running - # bundler command prefixed with `DEPENDENCIES_NEXT=1 - gem 'rails', '> 5.0', '< 5.1' - - gem 'activemerchant', '>= 1.78.0' - gem 'angular-rails-templates', '>= 0.3.0', '< 1.1.0' - gem 'awesome_nested_set' - gem 'rails-controller-testing' - gem 'ransack', '2.3.0' - gem 'responders' -else - gem 'rails', '~> 4.2' - - gem 'activemerchant', '~> 1.78.0' - gem 'angular-rails-templates', '~> 0.3.0' - gem 'awesome_nested_set', '~> 3.4.0' - gem 'ransack', '~> 1.8.10' - gem 'responders', '~> 2.0' - - gem 'db2fog' - gem 'unicorn' - - group :test do - gem 'test_after_commit' # needed to test Devise callbacks - end -end +gem 'activemerchant', '>= 1.78.0' +gem 'angular-rails-templates', '>= 0.3.0' +gem 'awesome_nested_set' +gem 'ransack', '2.3.0' +gem 'responders' +gem 'sass', '<= 4.7.1' +gem 'sass-rails', '< 6.0.0' gem 'i18n' -gem 'i18n-js', '~> 3.8.1' +gem 'i18n-js', '~> 3.8.2' gem 'rails-i18n' gem 'rails_safe_tasks', '~> 1.0' gem "activerecord-import" +gem "db2fog", github: "openfoodfoundation/db2fog", branch: "rails-5" +gem "fog-aws", ">= 0.6.0" gem "catalog", path: "./engines/catalog" gem 'dfc_provider', path: './engines/dfc_provider' @@ -53,11 +32,11 @@ gem 'activerecord-postgresql-adapter' gem 'pg', '~> 0.21.0' gem 'acts_as_list', '0.9.19' -gem 'cancancan', '~> 1.7.0' +gem 'cancancan', '~> 1.15.0' gem 'ffaker' gem 'highline', '2.0.3' # Necessary for the install generator gem 'json' -gem 'monetize', '~> 1.10' +gem 'monetize', '~> 1.11' gem 'paranoia', '~> 2.4' gem 'state_machines-activerecord' gem 'stringex', '~> 2.8.5' @@ -69,7 +48,7 @@ gem 'devise' gem 'devise-encryptable' gem 'devise-token_authenticatable' gem 'jwt', '~> 2.2' -gem 'oauth2', '~> 1.4.4' # Used for Stripe Connect +gem 'oauth2', '~> 1.4.7' # Used for Stripe Connect gem 'daemons' gem 'delayed_job_active_record' @@ -78,7 +57,7 @@ gem 'delayed_job_web' gem 'kaminari', '~> 1.2.1' gem 'andand' -gem 'angularjs-rails', '1.5.5' +gem 'angularjs-rails', '1.8.0' gem 'aws-sdk', '1.67.0' gem 'bugsnag' gem 'haml' @@ -89,7 +68,7 @@ gem 'actionpack-action_caching' # AMS is deprecated, we will introduce an alternative at some point gem "active_model_serializers", "0.8.4" gem 'activerecord-session_store' -gem 'acts-as-taggable-on', '~> 4.0' +gem 'acts-as-taggable-on', '~> 7.0' gem 'angularjs-file-upload-rails', '~> 2.4.1' gem 'custom_error_message', github: 'jeremydurham/custom-err-msg' gem 'dalli' @@ -104,7 +83,7 @@ gem 'roadie-rails', '~> 1.3.0' gem 'combine_pdf' gem 'wicked_pdf' -gem 'wkhtmltopdf-binary' +gem 'wkhtmltopdf-binary', '0.12.5' # We need to upgrade our CI before we can bump this :/ gem 'immigrant' gem 'roo', '~> 2.8.3' @@ -116,15 +95,12 @@ gem 'test-unit', '~> 3.4' gem 'coffee-rails', '~> 4.2.2' gem 'compass-rails' -gem 'libv8', '< 8' -gem 'mini_racer', '0.2.15' +gem 'mini_racer', '0.3.1' gem 'uglifier', '>= 1.0.3' gem 'angular_rails_csrf' gem 'foundation-icons-sass-rails' -gem 'sass', '<= 4.7.1' -gem 'sass-rails', '< 6.0.0' gem 'foundation-rails', '= 5.5.2.1' @@ -168,6 +144,7 @@ group :test do gem 'simplecov', require: false gem 'test-prof' gem 'webmock' + gem 'rails-controller-testing' # See spec/spec_helper.rb for instructions # gem 'perftools.rb' end diff --git a/Gemfile.lock b/Gemfile.lock index 87b227d29838..f75b856edae7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,6 +4,16 @@ GIT specs: custom_error_message (1.1.1) +GIT + remote: https://github.com/openfoodfoundation/db2fog.git + revision: 8ceef362c64e6573d62d26db5ebb0c0f33cd3d61 + branch: rails-5 + specs: + db2fog (0.9.1) + activerecord (>= 3.2.0, < 6.0) + fog-core (~> 1.0) + rails (>= 3.2.0, < 6.0) + GIT remote: https://github.com/openfoodfoundation/ofn-qz.git revision: 467f6ea1c44529c7c91cac4c8211bbd863588c0b @@ -37,45 +47,47 @@ PATH GEM remote: https://rubygems.org/ specs: - CFPropertyList (2.3.6) - actionmailer (4.2.11.3) - actionpack (= 4.2.11.3) - actionview (= 4.2.11.3) - activejob (= 4.2.11.3) + actioncable (5.0.7.2) + actionpack (= 5.0.7.2) + nio4r (>= 1.2, < 3.0) + websocket-driver (~> 0.6.1) + actionmailer (5.0.7.2) + actionpack (= 5.0.7.2) + actionview (= 5.0.7.2) + activejob (= 5.0.7.2) mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.11.3) - actionview (= 4.2.11.3) - activesupport (= 4.2.11.3) - rack (~> 1.6) - rack-test (~> 0.6.2) - rails-dom-testing (~> 1.0, >= 1.0.5) + rails-dom-testing (~> 2.0) + actionpack (5.0.7.2) + actionview (= 5.0.7.2) + activesupport (= 5.0.7.2) + rack (~> 2.0) + rack-test (~> 0.6.3) + rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) actionpack-action_caching (1.2.1) actionpack (>= 4.0.0) - actionview (4.2.11.3) - activesupport (= 4.2.11.3) + actionview (5.0.7.2) + activesupport (= 5.0.7.2) 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.3) active_model_serializers (0.8.4) activemodel (>= 3.0) - activejob (4.2.11.3) - activesupport (= 4.2.11.3) - globalid (>= 0.3.0) - activemerchant (1.78.0) - activesupport (>= 3.2.14, < 6.x) + activejob (5.0.7.2) + activesupport (= 5.0.7.2) + globalid (>= 0.3.6) + activemerchant (1.107.4) + activesupport (>= 4.2) builder (>= 2.1.2, < 4.0.0) i18n (>= 0.6.9) nokogiri (~> 1.4) - activemodel (4.2.11.3) - activesupport (= 4.2.11.3) - builder (~> 3.1) - activerecord (4.2.11.3) - activemodel (= 4.2.11.3) - activesupport (= 4.2.11.3) - arel (~> 6.0) + activemodel (5.0.7.2) + activesupport (= 5.0.7.2) + activerecord (5.0.7.2) + activemodel (= 5.0.7.2) + activesupport (= 5.0.7.2) + arel (~> 7.0) activerecord-import (1.0.8) activerecord (>= 3.2) activerecord-postgresql-adapter (0.0.1) @@ -86,35 +98,32 @@ GEM multi_json (~> 1.11, >= 1.11.2) rack (>= 1.5.2, < 3) railties (>= 4.0) - activesupport (4.2.11.3) - i18n (~> 0.7) + activesupport (5.0.7.2) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) minitest (~> 5.1) - thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - acts-as-taggable-on (4.0.0) - activerecord (>= 4.0) + acts-as-taggable-on (7.0.0) + activerecord (>= 5.0, < 6.2) acts_as_list (0.9.19) activerecord (>= 3.0) addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) - aliyun-sdk (0.8.0) - nokogiri (~> 1.6) - rest-client (~> 2.0) andand (1.3.3) - angular-rails-templates (0.3.0) - railties (>= 3.1) - sprockets (~> 2.0) + angular-rails-templates (1.1.0) + railties (>= 4.2, < 7) + sprockets (>= 3.0, < 5) tilt angular_rails_csrf (4.2.0) railties (>= 3, < 7) angularjs-file-upload-rails (2.4.1) - angularjs-rails (1.5.5) - arel (6.0.4) + angularjs-rails (1.8.0) + arel (7.1.4) ast (2.4.2) atomic (1.1.101) awesome_nested_set (3.4.0) activerecord (>= 4.0.0, < 7.0) - awesome_print (1.8.0) + awesome_print (1.9.2) aws-sdk (1.67.0) aws-sdk-v1 (= 1.67.0) aws-sdk-v1 (1.67.0) @@ -128,7 +137,7 @@ GEM activesupport (>= 3.0.0) uniform_notifier (~> 1.11) byebug (11.1.3) - cancancan (1.7.1) + cancancan (1.15.0) capybara (3.32.2) addressable mini_mime (>= 0.1.3) @@ -139,7 +148,7 @@ GEM xpath (~> 3.2) childprocess (3.0.0) chronic (0.10.2) - chunky_png (1.3.14) + chunky_png (1.4.0) climate_control (0.2.0) cocaine (0.5.8) climate_control (>= 0.0.3, < 1.0) @@ -178,10 +187,6 @@ GEM daemons (1.3.1) dalli (2.7.11) database_cleaner (1.99.0) - db2fog (0.9.0) - activerecord (>= 3.2.0, < 5.0) - fog (~> 1.0) - rails (>= 3.2.0, < 5.0) ddtrace (0.46.0) msgpack debugger-linecache (1.2.0) @@ -207,171 +212,36 @@ GEM devise (>= 4.0.0, < 5.0.0) diff-lcs (1.4.4) docile (1.3.4) - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) - dry-inflector (0.1.2) erubis (2.7.0) eventmachine (1.2.7) - excon (0.78.0) + excon (0.79.0) execjs (2.7.0) factory_bot (5.2.0) activesupport (>= 4.2.0) factory_bot_rails (5.2.0) factory_bot (~> 5.2.0) railties (>= 4.2.0) - faraday (1.0.1) + faraday (1.3.0) + faraday-net_http (~> 1.0) multipart-post (>= 1.2, < 3) + ruby2_keywords + faraday-net_http (1.0.1) ffaker (2.16.0) - ffi (1.13.1) + ffi (1.15.0) figaro (1.2.0) thor (>= 0.14.0, < 2) - fission (0.5.0) - CFPropertyList (~> 2.2) - fog (1.41.0) - fog-aliyun (>= 0.1.0) - fog-atmos - fog-aws (>= 0.6.0) - fog-brightbox (~> 0.4) - fog-cloudatcost (~> 0.1.0) - fog-core (~> 1.45) - fog-digitalocean (>= 0.3.0) - fog-dnsimple (~> 1.0) - fog-dynect (~> 0.0.2) - fog-ecloud (~> 0.1) - fog-google (<= 0.1.0) - fog-internet-archive - fog-joyent - fog-json - fog-local - fog-openstack - fog-powerdns (>= 0.1.1) - fog-profitbricks - fog-rackspace - fog-radosgw (>= 0.0.2) - fog-riakcs - fog-sakuracloud (>= 0.0.4) - fog-serverlove - fog-softlayer - fog-storm_on_demand - fog-terremark - fog-vmfusion - fog-voxel - fog-vsphere (>= 0.4.0) - fog-xenserver - fog-xml (~> 0.1.1) - ipaddress (~> 0.5) - json (>= 1.8, < 2.0) - fog-aliyun (0.3.19) - aliyun-sdk (~> 0.8.0) - fog-core - fog-json - ipaddress (~> 0.8) - xml-simple (~> 1.1) - fog-atmos (0.1.0) - fog-core - fog-xml fog-aws (2.0.1) fog-core (~> 1.38) fog-json (~> 1.0) fog-xml (~> 0.1) ipaddress (~> 0.8) - fog-brightbox (0.16.1) - dry-inflector - fog-core - fog-json - mime-types - fog-cloudatcost (0.1.2) - fog-core (~> 1.36) - fog-json (~> 1.0) - fog-xml (~> 0.1) - ipaddress (~> 0.8) fog-core (1.45.0) builder excon (~> 0.58) formatador (~> 0.2) - fog-digitalocean (0.4.0) - fog-core - fog-json - fog-xml - ipaddress (>= 0.5) - fog-dnsimple (1.0.0) - fog-core (~> 1.38) - fog-json (~> 1.0) - fog-dynect (0.0.3) - fog-core - fog-json - fog-xml - fog-ecloud (0.3.0) - fog-core - fog-xml - fog-google (0.1.0) - fog-core - fog-json - fog-xml - fog-internet-archive (0.0.2) - fog-core - fog-json - fog-xml - fog-joyent (0.0.1) - fog-core (~> 1.42) - fog-json (>= 1.0) fog-json (1.2.0) fog-core multi_json (~> 1.10) - fog-local (0.6.0) - fog-core (>= 1.27, < 3.0) - fog-openstack (0.3.10) - fog-core (>= 1.45, <= 2.1.0) - fog-json (>= 1.0) - ipaddress (>= 0.8) - fog-powerdns (0.2.0) - fog-core - fog-json - fog-xml - fog-profitbricks (4.1.1) - fog-core (~> 1.42) - fog-json (~> 1.0) - fog-rackspace (0.1.6) - fog-core (>= 1.35) - fog-json (>= 1.0) - fog-xml (>= 0.1) - ipaddress (>= 0.8) - fog-radosgw (0.0.5) - fog-core (>= 1.21.0) - fog-json - fog-xml (>= 0.0.1) - fog-riakcs (0.1.0) - fog-core - fog-json - fog-xml - fog-sakuracloud (1.7.5) - fog-core - fog-json - fog-serverlove (0.1.2) - fog-core - fog-json - fog-softlayer (1.1.4) - fog-core - fog-json - fog-storm_on_demand (0.1.1) - fog-core - fog-json - fog-terremark (0.1.0) - fog-core - fog-xml - fog-vmfusion (0.1.0) - fission - fog-core - fog-voxel (0.1.0) - fog-core - fog-xml - fog-vsphere (3.4.0) - fog-core - rbvmomi (>= 1.9, < 3) - fog-xenserver (1.0.0) - fog-core - fog-xml - xmlrpc fog-xml (0.1.3) fog-core nokogiri (>= 1.5.11, < 2.0.0) @@ -399,13 +269,9 @@ GEM tilt hashdiff (1.0.1) highline (2.0.3) - hike (1.2.3) - http-accept (1.7.0) - http-cookie (1.0.3) - domain_name (~> 0.5) - i18n (0.9.5) + i18n (1.8.9) concurrent-ruby (~> 1.0) - i18n-js (3.8.1) + i18n-js (3.8.2) i18n (>= 0.6.6) immigrant (0.3.6) activerecord (>= 3.0) @@ -443,7 +309,7 @@ GEM addressable (~> 2.3) letter_opener (1.7.0) launchy (~> 2.2) - libv8 (7.3.492.27.1) + libv8 (8.4.255.0) loofah (2.9.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) @@ -452,30 +318,31 @@ GEM method_source (1.0.0) mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2020.0512) + mime-types-data (3.2020.1104) mini_mime (1.0.2) mini_portile2 (2.4.0) - mini_racer (0.2.15) - libv8 (> 7.3) + mini_racer (0.3.1) + libv8 (~> 8.4.255) minitest (5.14.4) - monetize (1.10.0) + monetize (1.11.0) money (~> 6.12) - money (6.14.0) + money (6.14.1) i18n (>= 0.6.4, <= 2) msgpack (1.4.2) multi_json (1.15.0) multi_xml (0.6.0) multipart-post (2.1.1) - netrc (0.11.0) + mustermann (1.1.1) + ruby2_keywords (~> 0.0.1) + nio4r (2.5.2) nokogiri (1.10.10) mini_portile2 (~> 2.4.0) - oauth2 (1.4.4) + oauth2 (1.4.7) faraday (>= 0.8, < 2.0) jwt (>= 1.0, < 3.0) multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - optimist (3.0.1) orm_adapter (0.5.0) paper_trail (10.3.1) activerecord (>= 4.2) @@ -497,6 +364,8 @@ GEM paypal-sdk-merchant (1.117.2) paypal-sdk-core (~> 0.3.0) pg (0.21.0) + polyamorous (2.3.0) + activerecord (>= 5.0) power_assert (2.0.0) pry (0.13.1) coderay (~> 1.1) @@ -505,72 +374,66 @@ GEM byebug (~> 11.0) pry (~> 0.13.0) public_suffix (4.0.6) - rack (1.6.13) + rack (2.2.3) rack-mini-profiler (2.3.1) rack (>= 1.2.0) - rack-protection (1.5.5) + rack-protection (2.1.0) rack rack-rewrite (1.5.1) rack-ssl (1.4.1) rack rack-test (0.6.3) rack (>= 1.0) - rails (4.2.11.3) - actionmailer (= 4.2.11.3) - actionpack (= 4.2.11.3) - actionview (= 4.2.11.3) - activejob (= 4.2.11.3) - activemodel (= 4.2.11.3) - activerecord (= 4.2.11.3) - activesupport (= 4.2.11.3) - bundler (>= 1.3.0, < 2.0) - railties (= 4.2.11.3) - sprockets-rails - rails-deprecated_sanitizer (1.0.4) - activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.9) - activesupport (>= 4.2.0, < 5.0) - nokogiri (~> 1.6) - rails-deprecated_sanitizer (>= 1.0.1) + rails (5.0.7.2) + actioncable (= 5.0.7.2) + actionmailer (= 5.0.7.2) + actionpack (= 5.0.7.2) + actionview (= 5.0.7.2) + activejob (= 5.0.7.2) + activemodel (= 5.0.7.2) + activerecord (= 5.0.7.2) + activesupport (= 5.0.7.2) + bundler (>= 1.3.0) + railties (= 5.0.7.2) + sprockets-rails (>= 2.0.0) + rails-controller-testing (1.0.5) + actionpack (>= 5.0.1.rc1) + actionview (>= 5.0.1.rc1) + activesupport (>= 5.0.1.rc1) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - rails-i18n (4.0.9) - i18n (~> 0.7) - railties (~> 4.0) + rails-i18n (5.1.3) + i18n (>= 0.7, < 2) + railties (>= 5.0, < 6) rails_safe_tasks (1.0.0) - railties (4.2.11.3) - actionpack (= 4.2.11.3) - activesupport (= 4.2.11.3) + railties (5.0.7.2) + actionpack (= 5.0.7.2) + activesupport (= 5.0.7.2) + method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rainbow (3.0.0) raindrops (0.19.1) rake (13.0.3) - ransack (1.8.10) - actionpack (>= 3.0, < 5.2) - activerecord (>= 3.0, < 5.2) - activesupport (>= 3.0, < 5.2) + ransack (2.3.0) + actionpack (>= 5.0) + activerecord (>= 5.0) + activesupport (>= 5.0) i18n + polyamorous (= 2.3.0) rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) - rbvmomi (2.4.1) - builder (~> 3.0) - json (>= 1.8) - nokogiri (~> 1.5) - optimist (~> 3.0) redcarpet (3.5.1) regexp_parser (1.8.2) request_store (1.5.0) rack (>= 1.4) - responders (2.4.1) - actionpack (>= 4.2.0, < 6.0) - railties (>= 4.2.0, < 6.0) - rest-client (2.1.0) - http-accept (>= 1.7.0, < 2.0) - http-cookie (>= 1.0.2, < 2.0) - mime-types (>= 1.16, < 4.0) - netrc (~> 0.8) + responders (3.0.1) + actionpack (>= 5.0) + railties (>= 5.0) rexml (3.2.4) roadie (3.5.1) css_parser (~> 1.4) @@ -590,10 +453,10 @@ GEM rspec-expectations (3.10.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) - rspec-mocks (3.10.0) + rspec-mocks (3.10.2) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.10.0) - rspec-rails (4.0.2) + rspec-rails (4.1.2) actionpack (>= 4.2) activesupport (>= 4.2) railties (>= 4.2) @@ -603,7 +466,7 @@ GEM rspec-support (~> 3.10) rspec-retry (0.6.2) rspec-core (> 3.3) - rspec-support (3.10.1) + rspec-support (3.10.2) rswag (2.4.0) rswag-api (= 2.4.0) rswag-specs (= 2.4.0) @@ -634,6 +497,7 @@ GEM rubocop (>= 0.90.0, < 2.0) ruby-progressbar (1.11.0) ruby-rc4 (0.1.5) + ruby2_keywords (0.0.2) rubyzip (2.3.0) sass (3.4.25) sass-rails (5.0.7) @@ -654,22 +518,21 @@ GEM docile (~> 1.1) simplecov-html (~> 0.11) simplecov-html (0.12.3) - sinatra (1.4.8) - rack (~> 1.5) - rack-protection (~> 1.4) - tilt (>= 1.3, < 3) + sinatra (2.1.0) + mustermann (~> 1.0) + rack (~> 2.2) + rack-protection (= 2.1.0) + tilt (~> 2.0) spring (2.1.1) spring-commands-rspec (1.0.4) spring (>= 0.9.1) - sprockets (2.12.5) - hike (~> 1.2) - multi_json (~> 1.0) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.3.3) - actionpack (>= 3.0) - activesupport (>= 3.0) - sprockets (>= 2.8, < 4.0) + sprockets (3.7.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.2) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) state_machines (0.5.0) state_machines-activemodel (0.7.1) activemodel (>= 4.1) @@ -683,19 +546,14 @@ GEM test-prof (0.11.3) test-unit (3.4.0) power_assert - test_after_commit (1.2.2) - activerecord (>= 3.2, < 5.0) thor (0.20.3) thread_safe (0.3.6) - tilt (1.4.1) + tilt (2.0.10) timecop (0.9.4) tzinfo (1.2.9) thread_safe (~> 0.1) uglifier (4.2.0) execjs (>= 0.3.0, < 3) - unf (0.1.4) - unf_ext - unf_ext (0.0.7.7) unicode-display_width (2.0.0) unicorn (5.8.0) kgio (~> 2.6) @@ -707,8 +565,8 @@ GEM get_process_mem (~> 0) unicorn (>= 4, < 6) uniform_notifier (1.14.1) - warden (1.2.7) - rack (>= 1.0) + warden (1.2.9) + rack (>= 2.0.9) webdrivers (4.6.0) nokogiri (~> 1.6) rubyzip (>= 1.3.0) @@ -717,13 +575,15 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) + websocket-driver (0.6.5) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.5) whenever (1.0.0) chronic (>= 0.6.3) wicked_pdf (2.1.0) activesupport wkhtmltopdf-binary (0.12.5) xml-simple (1.1.8) - xmlrpc (0.3.0) xpath (3.2.0) nokogiri (~> 1.8) @@ -733,25 +593,25 @@ PLATFORMS DEPENDENCIES actionpack-action_caching active_model_serializers (= 0.8.4) - activemerchant (~> 1.78.0) + activemerchant (>= 1.78.0) activerecord-import activerecord-postgresql-adapter activerecord-session_store - acts-as-taggable-on (~> 4.0) + acts-as-taggable-on (~> 7.0) acts_as_list (= 0.9.19) andand - angular-rails-templates (~> 0.3.0) + angular-rails-templates (>= 0.3.0) angular_rails_csrf angularjs-file-upload-rails (~> 2.4.1) - angularjs-rails (= 1.5.5) + angularjs-rails (= 1.8.0) atomic - awesome_nested_set (~> 3.4.0) + awesome_nested_set awesome_print aws-sdk (= 1.67.0) bugsnag bullet byebug - cancancan (~> 1.7.0) + cancancan (~> 1.15.0) capybara catalog! coffee-rails (~> 4.2.2) @@ -761,7 +621,7 @@ DEPENDENCIES daemons dalli database_cleaner - db2fog + db2fog! ddtrace debugger-linecache delayed_job_active_record @@ -774,6 +634,7 @@ DEPENDENCIES factory_bot_rails (= 5.2.0) ffaker figaro + fog-aws (>= 0.6.0) foundation-icons-sass-rails foundation-rails (= 5.5.2.1) fuubar (~> 2.5.1) @@ -783,7 +644,7 @@ DEPENDENCIES haml highline (= 2.0.3) i18n - i18n-js (~> 3.8.1) + i18n-js (~> 3.8.2) immigrant jquery-migrate-rails jquery-rails (= 4.4.0) @@ -794,10 +655,9 @@ DEPENDENCIES kaminari (~> 1.2.1) knapsack letter_opener (>= 1.4.1) - libv8 (< 8) - mini_racer (= 0.2.15) - monetize (~> 1.10) - oauth2 (~> 1.4.4) + mini_racer (= 0.3.1) + monetize (~> 1.11) + oauth2 (~> 1.4.7) ofn-qz! order_management! paper_trail (~> 10.3.1) @@ -810,12 +670,13 @@ DEPENDENCIES rack-mini-profiler (< 3.0.0) rack-rewrite rack-ssl - rails (~> 4.2) + rails (~> 5.0.0) + rails-controller-testing rails-i18n rails_safe_tasks (~> 1.0) - ransack (~> 1.8.10) + ransack (= 2.3.0) redcarpet - responders (~> 2.0) + responders roadie-rails (~> 1.3.0) roo (~> 2.8.3) rspec-rails (>= 3.5.2) @@ -836,10 +697,8 @@ DEPENDENCIES stripe test-prof test-unit (~> 3.4) - test_after_commit timecop uglifier (>= 1.0.3) - unicorn unicorn-rails unicorn-worker-killer web! @@ -847,7 +706,7 @@ DEPENDENCIES webmock whenever wicked_pdf - wkhtmltopdf-binary + wkhtmltopdf-binary (= 0.12.5) RUBY VERSION ruby 2.4.4p296