diff --git a/Gemfile b/Gemfile index 79ec63020..f6c8a6397 100644 --- a/Gemfile +++ b/Gemfile @@ -24,7 +24,7 @@ gem 'nokogiri' # style gem 'bootstrap-sass', '~> 3.4' -gem 'coffee-rails', '~> 4.2' +gem 'coffee-rails', '>= 5.0' gem 'jquery-rails' gem 'selectize-rails', '0.12.1' # include selectize.js for select gem 'kaminari' diff --git a/Gemfile.lock b/Gemfile.lock index 0aef76674..fcaf23fd9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -157,9 +157,9 @@ GEM childprocess (3.0.0) chronic (0.10.2) coderay (1.1.0) - coffee-rails (4.2.2) + coffee-rails (5.0.0) coffee-script (>= 2.2.0) - railties (>= 4.0.0) + railties (>= 5.2.0) coffee-script (2.4.1) coffee-script-source execjs @@ -498,7 +498,7 @@ DEPENDENCIES cancancan capybara coderay (= 1.1.0) - coffee-rails (~> 4.2) + coffee-rails (>= 5.0) company_register! countries daemons-rails (= 1.2.1) diff --git a/app/controllers/epp/base_controller.rb b/app/controllers/epp/base_controller.rb index 4c099730f..b8d73f8da 100644 --- a/app/controllers/epp/base_controller.rb +++ b/app/controllers/epp/base_controller.rb @@ -1,7 +1,7 @@ module Epp class BaseController < ActionController::Base class AuthorizationError < StandardError; end - + skip_before_action :verify_authenticity_token check_authorization layout false diff --git a/config/initializers/paper_trail.rb b/config/initializers/paper_trail.rb deleted file mode 100644 index 39a667917..000000000 --- a/config/initializers/paper_trail.rb +++ /dev/null @@ -1 +0,0 @@ -PaperTrail.config.track_associations = false diff --git a/test/test_helper.rb b/test/test_helper.rb index 3ab1e721d..bee6fdcf9 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -42,9 +42,6 @@ CompanyRegister::Client = CompanyRegisterClientStub EInvoice.provider = EInvoice::Providers::TestProvider.new class ActiveSupport::TestCase - # Run tests in parallel with specified workers - parallelize(workers: :number_of_processors) - ActiveRecord::Migration.check_pending! fixtures :all