diff --git a/Gemfile b/Gemfile index 86ee57ccb..048c396d5 100644 --- a/Gemfile +++ b/Gemfile @@ -84,7 +84,7 @@ gem "rakismet" gem "rollbar" gem "coffee-rails" -gem "jquery-ui-rails", "~> 5.0.0" +gem "jquery-ui-rails", "~> 7.0.0" gem "sassc-rails" # gem 'turbolinks' gem "lograge" diff --git a/Gemfile.lock b/Gemfile.lock index 8fc676940..a4c5cb1e7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -10,69 +10,69 @@ GEM specs: aasm (5.0.6) concurrent-ruby (~> 1.0) - actioncable (6.1.7.8) - actionpack (= 6.1.7.8) - activesupport (= 6.1.7.8) + actioncable (6.1.7.10) + actionpack (= 6.1.7.10) + activesupport (= 6.1.7.10) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.7.8) - actionpack (= 6.1.7.8) - activejob (= 6.1.7.8) - activerecord (= 6.1.7.8) - activestorage (= 6.1.7.8) - activesupport (= 6.1.7.8) + actionmailbox (6.1.7.10) + actionpack (= 6.1.7.10) + activejob (= 6.1.7.10) + activerecord (= 6.1.7.10) + activestorage (= 6.1.7.10) + activesupport (= 6.1.7.10) mail (>= 2.7.1) - actionmailer (6.1.7.8) - actionpack (= 6.1.7.8) - actionview (= 6.1.7.8) - activejob (= 6.1.7.8) - activesupport (= 6.1.7.8) + actionmailer (6.1.7.10) + actionpack (= 6.1.7.10) + actionview (= 6.1.7.10) + activejob (= 6.1.7.10) + activesupport (= 6.1.7.10) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.1.7.8) - actionview (= 6.1.7.8) - activesupport (= 6.1.7.8) + actionpack (6.1.7.10) + actionview (= 6.1.7.10) + activesupport (= 6.1.7.10) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.7.8) - actionpack (= 6.1.7.8) - activerecord (= 6.1.7.8) - activestorage (= 6.1.7.8) - activesupport (= 6.1.7.8) + actiontext (6.1.7.10) + actionpack (= 6.1.7.10) + activerecord (= 6.1.7.10) + activestorage (= 6.1.7.10) + activesupport (= 6.1.7.10) nokogiri (>= 1.8.5) - actionview (6.1.7.8) - activesupport (= 6.1.7.8) + actionview (6.1.7.10) + activesupport (= 6.1.7.10) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) actionview-encoded_mail_to (1.0.9) rails - activejob (6.1.7.8) - activesupport (= 6.1.7.8) + activejob (6.1.7.10) + activesupport (= 6.1.7.10) globalid (>= 0.3.6) - activemodel (6.1.7.8) - activesupport (= 6.1.7.8) + activemodel (6.1.7.10) + activesupport (= 6.1.7.10) activemodel-serializers-xml (1.0.3) activemodel (>= 5.0.0.a) activesupport (>= 5.0.0.a) builder (~> 3.1) - activerecord (6.1.7.8) - activemodel (= 6.1.7.8) - activesupport (= 6.1.7.8) + activerecord (6.1.7.10) + activemodel (= 6.1.7.10) + activesupport (= 6.1.7.10) activerecord-postgis-adapter (7.1.1) activerecord (~> 6.1) rgeo-activerecord (~> 7.0.0) - activestorage (6.1.7.8) - actionpack (= 6.1.7.8) - activejob (= 6.1.7.8) - activerecord (= 6.1.7.8) - activesupport (= 6.1.7.8) + activestorage (6.1.7.10) + actionpack (= 6.1.7.10) + activejob (= 6.1.7.10) + activerecord (= 6.1.7.10) + activesupport (= 6.1.7.10) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (6.1.7.8) + activesupport (6.1.7.10) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -180,7 +180,6 @@ GEM launchy (~> 2.1) mail (~> 2.7) erubi (1.13.0) - erubis (2.7.0) et-orbi (1.2.11) tzinfo eventmachine (1.2.7) @@ -191,29 +190,12 @@ GEM factory_bot_rails (6.4.3) factory_bot (~> 6.4) railties (>= 5.0.0) - faraday (1.10.2) - faraday-em_http (~> 1.0) - faraday-em_synchrony (~> 1.0) - faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0) - faraday-multipart (~> 1.0) - faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.0) - faraday-patron (~> 1.0) - faraday-rack (~> 1.0) - faraday-retry (~> 1.0) - ruby2_keywords (>= 0.0.4) - faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) - faraday-excon (1.1.0) - faraday-httpclient (1.0.1) - faraday-multipart (1.0.4) - multipart-post (~> 2) - faraday-net_http (1.0.1) - faraday-net_http_persistent (1.2.0) - faraday-patron (1.0.0) - faraday-rack (1.0.0) - faraday-retry (1.0.3) + faraday (2.12.0) + faraday-net_http (>= 2.0, < 3.4) + json + logger + faraday-net_http (3.3.0) + net-http ffi (1.17.0) flamegraph (0.9.5) font-awesome-rails (4.7.0.8) @@ -243,27 +225,23 @@ GEM rack-test (~> 2) grape-swagger-rails (0.5.0) railties (>= 6.0.6.1) - haml (5.1.2) - temple (>= 0.8.0) + haml (6.3.0) + temple (>= 0.8.2) + thor tilt - haml-rails (2.0.1) + haml-rails (2.1.0) actionpack (>= 5.1) activesupport (>= 5.1) - haml (>= 4.0.6, < 6.0) - html2haml (>= 1.0.1) + haml (>= 4.0.6) railties (>= 5.1) hashdiff (1.1.1) hashie (5.0.0) - highline (2.0.2) + highline (3.1.1) + reline hotwire-rails (0.1.3) rails (>= 6.0.0) stimulus-rails turbo-rails - html2haml (2.3.0) - erubis (~> 2.7.0) - haml (>= 4.0) - nokogiri (>= 1.6.0) - ruby_parser (~> 3.5) html2text (0.2.1) nokogiri (~> 1.6) htmlentities (4.3.4) @@ -273,14 +251,16 @@ GEM icalendar (2.5.3) ice_cube (~> 0.16) ice_cube (0.16.3) + io-console (0.7.2) jquery-rails (4.4.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - jquery-ui-rails (5.0.5) + jquery-ui-rails (7.0.0) railties (>= 3.2.16) json (2.7.5) - jwt (2.2.1) + jwt (2.9.3) + base64 kaminari (1.2.2) activesupport (>= 4.1.0) kaminari-actionview (= 1.2.2) @@ -330,7 +310,6 @@ GEM mono_logger (1.1.2) multi_json (1.15.0) multi_xml (0.6.0) - multipart-post (2.2.3) mustache (1.1.0) mustermann (3.0.3) ruby2_keywords (~> 0.0.1) @@ -338,7 +317,7 @@ GEM mustermann (>= 1.0.0) net-http (0.4.1) uri - net-imap (0.4.17) + net-imap (0.4.18) date net-protocol net-pop (0.1.2) @@ -347,29 +326,33 @@ GEM timeout net-smtp (0.5.0) net-protocol - nio4r (2.7.3) + nio4r (2.7.4) nokogiri (1.16.7) mini_portile2 (~> 2.8.2) racc (~> 1.4) normalizr (0.6.1) oauth (0.5.6) - oauth2 (1.4.4) - faraday (>= 0.8, < 2.0) + oauth2 (2.0.9) + faraday (>= 0.17.3, < 3.0) jwt (>= 1.0, < 3.0) - multi_json (~> 1.3) multi_xml (~> 0.5) - rack (>= 1.2, < 3) - omniauth (1.9.2) + rack (>= 1.2, < 4) + snaky_hash (~> 2.0) + version_gem (~> 1.1) + omniauth (2.1.2) hashie (>= 3.4.6) - rack (>= 1.6.2, < 3) - omniauth-facebook (6.0.0) - omniauth-oauth2 (~> 1.2) - omniauth-oauth (1.1.0) + rack (>= 2.2.3) + rack-protection + omniauth-facebook (10.0.0) + bigdecimal + omniauth-oauth2 (>= 1.2, < 3) + omniauth-oauth (1.2.1) oauth - omniauth (~> 1.0) - omniauth-oauth2 (1.6.0) - oauth2 (~> 1.1) - omniauth (~> 1.9) + omniauth (>= 1.0, < 3) + rack (>= 1.6.2, < 4) + omniauth-oauth2 (1.8.0) + oauth2 (>= 1.4, < 3) + omniauth (~> 2.0) omniauth-rails_csrf_protection (0.1.2) actionpack (>= 4.2) omniauth (>= 1.3.1) @@ -393,8 +376,8 @@ GEM activerecord (>= 6) popper_js (2.9.3) pr_geohash (1.0.0) - progress_bar (1.3.0) - highline (>= 1.6, < 3) + progress_bar (1.3.4) + highline (>= 1.6) options (~> 2.3.0) public_suffix (6.0.1) pundit (2.2.0) @@ -417,20 +400,20 @@ GEM rack (>= 1.3) rack-utf8_sanitizer (1.9.1) rack (>= 1.0, < 4.0) - rails (6.1.7.8) - actioncable (= 6.1.7.8) - actionmailbox (= 6.1.7.8) - actionmailer (= 6.1.7.8) - actionpack (= 6.1.7.8) - actiontext (= 6.1.7.8) - actionview (= 6.1.7.8) - activejob (= 6.1.7.8) - activemodel (= 6.1.7.8) - activerecord (= 6.1.7.8) - activestorage (= 6.1.7.8) - activesupport (= 6.1.7.8) + rails (6.1.7.10) + actioncable (= 6.1.7.10) + actionmailbox (= 6.1.7.10) + actionmailer (= 6.1.7.10) + actionpack (= 6.1.7.10) + actiontext (= 6.1.7.10) + actionview (= 6.1.7.10) + activejob (= 6.1.7.10) + activemodel (= 6.1.7.10) + activerecord (= 6.1.7.10) + activestorage (= 6.1.7.10) + activesupport (= 6.1.7.10) bundler (>= 1.15.0) - railties (= 6.1.7.8) + railties (= 6.1.7.10) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) @@ -450,9 +433,9 @@ GEM activemodel (>= 4.0) rails_autolink (1.1.6) rails (> 3.1) - railties (6.1.7.8) - actionpack (= 6.1.7.8) - activesupport (= 6.1.7.8) + railties (6.1.7.10) + actionpack (= 6.1.7.10) + activesupport (= 6.1.7.10) method_source rake (>= 12.2) thor (~> 1.0) @@ -469,6 +452,8 @@ GEM redis-namespace (1.11.0) redis (>= 4) regexp_parser (2.9.2) + reline (0.5.11) + io-console (~> 0.5) request_store (1.7.0) rack (>= 1.4) responders (3.1.1) @@ -544,8 +529,6 @@ GEM ruby-prof (0.18.0) ruby-progressbar (1.13.0) ruby2_keywords (0.0.5) - ruby_parser (3.15.1) - sexp_processor (~> 4.9) rubyzip (2.3.2) rufus-scheduler (3.9.1) fugit (~> 1.1, >= 1.1.6) @@ -564,7 +547,6 @@ GEM rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) - sexp_processor (4.13.0) shoulda-matchers (5.3.0) activesupport (>= 5.2.0) sinatra (3.2.0) @@ -572,6 +554,9 @@ GEM rack (~> 2.2, >= 2.2.4) rack-protection (= 3.2.0) tilt (~> 2.0) + snaky_hash (2.0.1) + hashie + version_gem (~> 1.1, >= 1.1.1) spring (2.0.2) activesupport (>= 4.2) spring-commands-rspec (1.0.4) @@ -598,7 +583,7 @@ GEM sunspot_solr tagsinput-rails (1.3.5.1) railties (>= 3.1) - temple (0.8.2) + temple (0.10.3) thin (1.7.2) daemons (~> 1.0, >= 1.0.9) eventmachine (~> 1.0, >= 1.0.4) @@ -607,7 +592,7 @@ GEM thumbs_up (0.4.6) activerecord tilt (2.4.0) - timeout (0.4.1) + timeout (0.4.2) tinymce-rails (5.10.4) railties (>= 3.1.1) turbo-rails (1.0.1) @@ -620,6 +605,7 @@ GEM unicode-display_width (2.6.0) uniform_notifier (1.16.0) uri (0.13.1) + version_gem (1.1.4) warden (1.2.9) rack (>= 2.0.9) webmock (3.24.0) @@ -680,7 +666,7 @@ DEPENDENCIES icalendar jqcloud-rails! jquery-rails (~> 4.4.0) - jquery-ui-rails (~> 5.0.0) + jquery-ui-rails (~> 7.0.0) kaminari kaminari-grape kaminari-i18n