zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-06-08 05:34:46 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1598 from internetee/preload-assets-only-via-manifest

Browse source 
Post-work for Rails 6 upgrade
This commit is contained in:
Timo Võhmar 2020-06-04 18:03:18 +03:00 • committed by GitHub
commit 740e6eba04
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -24,7 +24,7 @@ gem 'nokogiri'
# style # style
gem 'bootstrap-sass', '~> 3.4' gem 'bootstrap-sass', '~> 3.4'
gem 'coffee-rails', '~> 4.2' gem 'coffee-rails', '>= 5.0'
gem 'jquery-rails' gem 'jquery-rails'
gem 'selectize-rails', '0.12.1' # include selectize.js for select gem 'selectize-rails', '0.12.1' # include selectize.js for select
gem 'kaminari' gem 'kaminari'

6
Gemfile.lock
View file

@ -157,9 +157,9 @@ GEM
childprocess (3.0.0) childprocess (3.0.0)
chronic (0.10.2) chronic (0.10.2)
coderay (1.1.0) coderay (1.1.0)
coffee-rails (4.2.2) coffee-rails (5.0.0)
coffee-script (>= 2.2.0) coffee-script (>= 2.2.0)
railties (>= 4.0.0) railties (>= 5.2.0)
coffee-script (2.4.1) coffee-script (2.4.1)
coffee-script-source coffee-script-source
execjs execjs
@ -498,7 +498,7 @@ DEPENDENCIES
cancancan cancancan
capybara capybara
coderay (= 1.1.0) coderay (= 1.1.0)
coffee-rails (~> 4.2) coffee-rails (>= 5.0)
company_register! company_register!
countries countries
daemons-rails (= 1.2.1) daemons-rails (= 1.2.1)

2
app/controllers/epp/base_controller.rb
View file

@ -1,7 +1,7 @@
module Epp module Epp
class BaseController < ActionController::Base class BaseController < ActionController::Base
class AuthorizationError < StandardError; end class AuthorizationError < StandardError; end
skip_before_action :verify_authenticity_token
check_authorization check_authorization
layout false layout false

1
config/initializers/paper_trail.rb
View file

@ -1 +0,0 @@
PaperTrail.config.track_associations = false

3
test/test_helper.rb
View file

@ -42,9 +42,6 @@ CompanyRegister::Client = CompanyRegisterClientStub
EInvoice.provider = EInvoice::Providers::TestProvider.new EInvoice.provider = EInvoice::Providers::TestProvider.new
class ActiveSupport::TestCase class ActiveSupport::TestCase
# Run tests in parallel with specified workers
parallelize(workers: :number_of_processors)
ActiveRecord::Migration.check_pending! ActiveRecord::Migration.check_pending!
fixtures :all fixtures :all