Merge pull request #1935 from internetee/dependabot/bundler/jquery-ui-rails-6.0.1

This commit is contained in:
dependabot[bot] 2021-04-19 08:57:19 +00:00 committed by GitHub
commit 0c7a2b2e1c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 8 additions and 8 deletions

View file

@ -69,7 +69,7 @@ gem 'daemons-rails', '1.2.1'
gem 'que-web' gem 'que-web'
gem 'sidekiq' gem 'sidekiq'
gem 'pdfkit' gem 'pdfkit'
gem 'jquery-ui-rails', '5.0.5' gem 'jquery-ui-rails', '6.0.1'
gem 'airbrake' gem 'airbrake'
gem 'company_register', github: 'internetee/company_register', gem 'company_register', github: 'internetee/company_register',

View file

@ -254,7 +254,7 @@ GEM
rails-dom-testing (>= 1, < 3) rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0) railties (>= 4.2.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
jquery-ui-rails (5.0.5) jquery-ui-rails (6.0.1)
railties (>= 3.2.16) railties (>= 3.2.16)
json (2.5.1) json (2.5.1)
json-jwt (1.13.0) json-jwt (1.13.0)
@ -275,7 +275,7 @@ GEM
kaminari-core (1.2.1) kaminari-core (1.2.1)
libxml-ruby (3.2.1) libxml-ruby (3.2.1)
logger (1.4.3) logger (1.4.3)
loofah (2.9.0) loofah (2.9.1)
crass (~> 1.0.2) crass (~> 1.0.2)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
mail (2.7.1) mail (2.7.1)
@ -535,7 +535,7 @@ DEPENDENCIES
isikukood isikukood
iso8601 (= 0.12.1) iso8601 (= 0.12.1)
jquery-rails jquery-rails
jquery-ui-rails (= 5.0.5) jquery-ui-rails (= 6.0.1)
kaminari kaminari
lhv! lhv!
mime-types-data mime-types-data

View file

@ -5,7 +5,7 @@
#= require admin/autocomplete #= require admin/autocomplete
#= require jquery.nested_attributes #= require jquery.nested_attributes
#= require selectize #= require selectize
#= require jquery-ui/datepicker #= require jquery-ui/widgets/datepicker
#= require select2 #= require select2
#= require jquery.doubleScroll #= require jquery.doubleScroll

View file

@ -1,7 +1,7 @@
#= require jquery #= require jquery
#= require jquery_ujs #= require jquery_ujs
#= require bootstrap-sprockets #= require bootstrap-sprockets
#= require jquery-ui/datepicker #= require jquery-ui/widgets/datepicker
#= require select2 #= require select2
#= require datepicker #= require datepicker

View file

@ -3,7 +3,7 @@
#= require bootstrap-sprockets #= require bootstrap-sprockets
#= require typeahead.bundle.min #= require typeahead.bundle.min
#= require jquery.nested_attributes #= require jquery.nested_attributes
#= require jquery-ui/datepicker #= require jquery-ui/widgets/datepicker
#= require select2 #= require select2
#= require datepicker #= require datepicker

View file

@ -188,7 +188,7 @@ class CsyncRecordTest < ActiveSupport::TestCase
assert @domain.dnskeys.empty? assert @domain.dnskeys.empty?
mail = ActionMailer::Base.deliveries.last mail = ActionMailer::Base.deliveries.last
assert_equal (@domain.contacts.map(&:email) << @domain.registrant.email).uniq, mail.to assert_equal (@domain.contacts.map(&:email) << @domain.registrant.email).uniq.sort, mail.to.sort
assert_equal mail.subject, "Teie domeeni #{@domain.name} DNSSEC andmed on eemaldatud / DNSSEC data for #{@domain.name} has been removed" assert_equal mail.subject, "Teie domeeni #{@domain.name} DNSSEC andmed on eemaldatud / DNSSEC data for #{@domain.name} has been removed"
end end