diff --git a/Gemfile b/Gemfile index 82b5511e3b277b46949fa3410bf513563ace3d5b..af3fd4c06cea9052d9a549e293f69a253f07c9de 100644 --- a/Gemfile +++ b/Gemfile @@ -44,7 +44,7 @@ gem "i18n_date_range" gem "image_processing" gem "jbuilder" gem "jquery-rails" -gem "jquery-ui-rails", "~> 6.0.1" +gem "jquery-ui-rails", git: "https://github.com/jquery-ui-rails/jquery-ui-rails.git", tag: "v7.0.0" gem "kamifusen"#, path: "../kamifusen" gem "kaminari" gem "leaflet-rails" diff --git a/Gemfile.lock b/Gemfile.lock index d1cd931225a28335683b42d72ebc4912e450a83f..7cdbcd67e65274f94b1aea585201fa1cc1c3a344 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,11 @@ +GIT + remote: https://github.com/jquery-ui-rails/jquery-ui-rails.git + revision: 413265e81f790f795239e07e7e25e01429b2f18d + tag: v7.0.0 + specs: + jquery-ui-rails (7.0.0) + railties (>= 3.2.16) + GIT remote: https://github.com/noesya/summernote-rails.git revision: 32fd182c929cdcacaa6e3bd3569871bd025fa669 @@ -8,9 +16,9 @@ GIT GIT remote: https://github.com/noesya/two_factor_authentication.git - revision: 16fb01e5731c2b08ef0885134e5e0bdec2ed87ff + revision: a3505e961baf7cb0bf68bb3a6349aeaf5e1baf97 specs: - two_factor_authentication (4.1.1) + two_factor_authentication (4.1.2) devise encryptor rails (>= 3.1.1) @@ -112,20 +120,20 @@ GEM autoprefixer-rails (10.4.16.0) execjs (~> 2) aws-eventstream (1.3.0) - aws-partitions (1.859.0) - aws-sdk-core (3.188.0) - aws-eventstream (~> 1, >= 1.0.2) + aws-partitions (1.863.0) + aws-sdk-core (3.190.0) + aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.5) + aws-sigv4 (~> 1.8) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.73.0) + aws-sdk-kms (1.74.0) aws-sdk-core (~> 3, >= 3.188.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.140.0) - aws-sdk-core (~> 3, >= 3.188.0) + aws-sdk-s3 (1.141.0) + aws-sdk-core (~> 3, >= 3.189.0) aws-sdk-kms (~> 1) - aws-sigv4 (~> 1.6) - aws-sigv4 (1.7.0) + aws-sigv4 (~> 1.8) + aws-sigv4 (1.8.0) aws-eventstream (~> 1, >= 1.0.2) base64 (0.2.0) bcrypt (3.1.20) @@ -248,7 +256,7 @@ GEM ffi (1.16.3) figaro (1.2.0) thor (>= 0.14.0, < 2) - font-awesome-sass (6.4.2) + font-awesome-sass (6.5.1) sassc (~> 2.0) front_matter_parser (1.0.1) geo_calc (0.7.8) @@ -298,7 +306,7 @@ GEM mini_magick (>= 4.9.5, < 5) ruby-vips (>= 2.0.17, < 3) io-console (0.6.0) - irb (1.9.1) + irb (1.10.1) rdoc reline (>= 0.3.8) jbuilder (2.11.5) @@ -309,9 +317,7 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - jquery-ui-rails (6.0.1) - railties (>= 3.2.16) - json (2.6.3) + json (2.7.1) jwt (2.7.1) kamifusen (1.11.2) image_processing @@ -369,7 +375,7 @@ GEM nesty (1.0.2) net-http (0.4.0) uri - net-imap (0.4.6) + net-imap (0.4.7) date net-protocol net-pop (0.1.2) @@ -378,7 +384,7 @@ GEM timeout net-smtp (0.4.0) net-protocol - nio4r (2.6.1) + nio4r (2.7.0) nokogiri (1.15.5-arm64-darwin) racc (~> 1.4) nokogiri (1.15.5-x86_64-darwin) @@ -405,7 +411,7 @@ GEM omniauth-saml (2.1.0) omniauth (~> 2.0) ruby-saml (~> 1.12) - open-uri (0.4.0) + open-uri (0.4.1) stringio time uri @@ -428,7 +434,7 @@ GEM rack (>= 1.2.0) rack-protection (3.1.0) rack (~> 2.2, >= 2.2.4) - rack-session (1.0.1) + rack-session (1.0.2) rack (< 3) rack-test (2.1.0) rack (>= 1.3) @@ -474,10 +480,10 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rdoc (6.6.0) + rdoc (6.6.1) psych (>= 4.0.0) - regexp_parser (2.8.2) - reline (0.4.0) + regexp_parser (2.8.3) + reline (0.4.1) io-console (~> 0.5) requests (1.0.2) require_all (3.0.0) @@ -654,7 +660,7 @@ DEPENDENCIES image_processing jbuilder jquery-rails - jquery-ui-rails (~> 6.0.1) + jquery-ui-rails! kamifusen kaminari leaflet-rails diff --git a/app/assets/javascripts/devise.js b/app/assets/javascripts/devise.js index 87f4ad18ee3ead168bb2e72b76cfb736557c7246..4cd55b2404226f88157a036863b8fa4a60d0aaae 100644 --- a/app/assets/javascripts/devise.js +++ b/app/assets/javascripts/devise.js @@ -9,6 +9,5 @@ //= require cropperjs/dist/cropper //= require jquery-cropper/dist/jquery-cropper //= require_self -//= require_tree ./admin/plugins window.osuny = {};