diff --git a/Gemfile b/Gemfile index e334f045..d48c829b 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://gems.ruby-china.com' git_source(:github) { |repo| "https://github.com/#{repo}.git" } -gem 'rails', '~> 5.2.0' +gem 'rails', '~> 6.1.0' gem 'mysql2', '>= 0.4.4', '< 0.6.0' gem 'puma', '~> 5.6.5' gem 'sass-rails', '~> 5.0' @@ -26,7 +26,7 @@ gem 'roo-xls' gem 'roo', '2.8.3' gem 'simple_xlsx_reader' -gem 'rubyzip' +gem 'rubyzip', '~> 1.3.0' gem 'spreadsheet' gem 'ruby-ole' @@ -46,7 +46,7 @@ gem 'redcarpet', '~> 3.4' gem 'rqrcode', '~> 0.10.1' gem 'rqrcode_png' -gem 'acts-as-taggable-on', '~> 6.0' +gem 'acts-as-taggable-on', '~> 9.0' # a tree structure gem 'ancestry' @@ -57,7 +57,7 @@ gem 'omniauth-cas' gem 'rack-mini-profiler' # object-based searching -gem 'ransack' +gem 'ransack','~> 3.0.1' group :development, :test do gem 'rspec-rails', '~> 3.8' @@ -65,8 +65,8 @@ end group :development do gem 'prettier', '2.1.0' - gem 'rubocop', '~> 0.52.0' - gem 'solargraph', '~> 0.38.0' + gem 'rubocop', '~> 1.38.0' + gem 'solargraph', '~> 0.47.2' gem 'awesome_print' gem 'web-console', '>= 3.3.0' gem 'listen', '>= 3.0.5', '< 3.2' @@ -97,12 +97,12 @@ gem 'simple_form' gem 'font-awesome-sass', '4.7.0' # i18n -gem 'rails-i18n', '~> 5.1' +gem 'rails-i18n', '~> 7.0.6' # job gem 'sidekiq',"5.2.8" gem 'sinatra' -gem "sidekiq-cron", "1.2.0" +gem "sidekiq-cron", "~>1.8.0" # batch insert gem 'bulk_insert' @@ -118,7 +118,7 @@ gem 'diffy' gem 'deep_cloneable', '~> 3.0.0' # oauth2 -gem 'omniauth', '~> 1.9.0' +gem 'omniauth', '~> 1.9.2' gem 'omniauth-oauth2', '~> 1.6.0' # global var diff --git a/Gemfile.lock b/Gemfile.lock index 3e037ba3..6bd34514 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,63 +3,80 @@ GEM specs: aasm (5.4.0) concurrent-ruby (~> 1.0) - actioncable (5.2.8.1) - actionpack (= 5.2.8.1) + actioncable (6.1.7) + actionpack (= 6.1.7) + activesupport (= 6.1.7) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.8.1) - actionpack (= 5.2.8.1) - actionview (= 5.2.8.1) - activejob (= 5.2.8.1) + actionmailbox (6.1.7) + actionpack (= 6.1.7) + activejob (= 6.1.7) + activerecord (= 6.1.7) + activestorage (= 6.1.7) + activesupport (= 6.1.7) + mail (>= 2.7.1) + actionmailer (6.1.7) + actionpack (= 6.1.7) + actionview (= 6.1.7) + activejob (= 6.1.7) + activesupport (= 6.1.7) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.8.1) - actionview (= 5.2.8.1) - activesupport (= 5.2.8.1) - rack (~> 2.0, >= 2.0.8) + actionpack (6.1.7) + actionview (= 6.1.7) + activesupport (= 6.1.7) + rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.8.1) - activesupport (= 5.2.8.1) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actiontext (6.1.7) + actionpack (= 6.1.7) + activerecord (= 6.1.7) + activestorage (= 6.1.7) + activesupport (= 6.1.7) + nokogiri (>= 1.8.5) + actionview (6.1.7) + activesupport (= 6.1.7) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) + rails-html-sanitizer (~> 1.1, >= 1.2.0) active_decorator (1.4.0) activesupport - activejob (5.2.8.1) - activesupport (= 5.2.8.1) + activejob (6.1.7) + activesupport (= 6.1.7) globalid (>= 0.3.6) - activemodel (5.2.8.1) - activesupport (= 5.2.8.1) - activerecord (5.2.8.1) - activemodel (= 5.2.8.1) - activesupport (= 5.2.8.1) - arel (>= 9.0) - activestorage (5.2.8.1) - actionpack (= 5.2.8.1) - activerecord (= 5.2.8.1) - marcel (~> 1.0.0) - activesupport (5.2.8.1) + activemodel (6.1.7) + activesupport (= 6.1.7) + activerecord (6.1.7) + activemodel (= 6.1.7) + activesupport (= 6.1.7) + activestorage (6.1.7) + actionpack (= 6.1.7) + activejob (= 6.1.7) + activerecord (= 6.1.7) + activesupport (= 6.1.7) + marcel (~> 1.0) + mini_mime (>= 1.1.0) + activesupport (6.1.7) concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - acts-as-taggable-on (6.5.0) - activerecord (>= 5.0, < 6.1) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + zeitwerk (~> 2.3) + acts-as-taggable-on (9.0.1) + activerecord (>= 6.0, < 7.1) acts_as_list (1.0.4) activerecord (>= 4.2) addressable (2.8.1) public_suffix (>= 2.0.2, < 6.0) ancestry (4.2.0) activerecord (>= 5.2.6) - annotate (2.6.7) + annotate (2.6.5) activerecord (>= 2.3.0) - rake (~> 10.4.2, >= 10.4.2) + rake (>= 0.8.7) archive-zip (0.12.0) io-like (~> 0.3.0) - arel (9.0.0) ast (2.4.2) autoprefixer-rails (10.4.7.0) execjs (~> 2) @@ -153,6 +170,7 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) + json (2.6.2) jwt (2.5.0) kaminari (1.2.2) activesupport (>= 4.1.0) @@ -166,6 +184,10 @@ GEM activerecord kaminari-core (= 1.2.2) kaminari-core (1.2.2) + kramdown (2.4.0) + rexml + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) letter_avatar (0.3.9) listen (3.1.5) rb-fsevent (~> 0.9, >= 0.9.4) @@ -177,7 +199,6 @@ GEM mail (2.7.1) mini_mime (>= 0.1.1) marcel (1.0.2) - maruku (0.7.3) method_source (1.0.0) mime-types (3.4.1) mime-types-data (~> 3.2015) @@ -217,11 +238,10 @@ GEM oauth2 (~> 1.1) omniauth (~> 1.9) parallel (1.22.1) - parser (2.7.2.0) + parser (3.1.2.1) ast (~> 2.4.1) pdfkit (0.8.7.2) popper_js (1.16.1) - powerpack (0.1.3) prettier (2.1.0) public_suffix (5.0.0) puma (5.6.5) @@ -237,38 +257,40 @@ GEM rack rack-test (2.0.2) rack (>= 1.3) - rails (5.2.8.1) - actioncable (= 5.2.8.1) - actionmailer (= 5.2.8.1) - actionpack (= 5.2.8.1) - actionview (= 5.2.8.1) - activejob (= 5.2.8.1) - activemodel (= 5.2.8.1) - activerecord (= 5.2.8.1) - activestorage (= 5.2.8.1) - activesupport (= 5.2.8.1) - bundler (>= 1.3.0) - railties (= 5.2.8.1) + rails (6.1.7) + actioncable (= 6.1.7) + actionmailbox (= 6.1.7) + actionmailer (= 6.1.7) + actionpack (= 6.1.7) + actiontext (= 6.1.7) + actionview (= 6.1.7) + activejob (= 6.1.7) + activemodel (= 6.1.7) + activerecord (= 6.1.7) + activestorage (= 6.1.7) + activesupport (= 6.1.7) + bundler (>= 1.15.0) + railties (= 6.1.7) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.4.3) loofah (~> 2.3) - rails-i18n (5.1.3) + rails-i18n (7.0.6) i18n (>= 0.7, < 2) - railties (>= 5.0, < 6) - railties (5.2.8.1) - actionpack (= 5.2.8.1) - activesupport (= 5.2.8.1) + railties (>= 6.0.0, < 8) + railties (6.1.7) + actionpack (= 6.1.7) + activesupport (= 6.1.7) method_source - rake (>= 0.8.7) - thor (>= 0.19.0, < 2.0) + rake (>= 12.2) + thor (~> 1.0) rainbow (3.1.1) - rake (10.4.2) - ransack (2.5.0) - activerecord (>= 5.2.4) - activesupport (>= 5.2.4) + rake (13.0.6) + ransack (3.0.1) + activerecord (>= 6.0.4) + activesupport (>= 6.0.4) i18n rb-fsevent (0.11.2) rb-inotify (0.10.1) @@ -300,8 +322,9 @@ GEM http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - reverse_markdown (1.4.0) + reverse_markdown (2.1.1) nokogiri + rexml (3.2.5) roo (2.8.3) nokogiri (~> 1) rubyzip (>= 1.3.0, < 3.0.0) @@ -331,13 +354,18 @@ GEM rspec-mocks (~> 3.9.0) rspec-support (~> 3.9.0) rspec-support (3.9.4) - rubocop (0.52.1) + rubocop (1.38.0) + json (~> 2.3) parallel (~> 1.10) - parser (>= 2.4.0.2, < 3.0) - powerpack (~> 0.1) + parser (>= 3.1.2.1) rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) + rexml (>= 3.2.5, < 4.0) + rubocop-ast (>= 1.23.0, < 2.0) ruby-progressbar (~> 1.7) - unicode-display_width (~> 1.0, >= 1.0.1) + unicode-display_width (>= 1.4.0, < 3.0) + rubocop-ast (1.23.0) + parser (>= 3.1.1.0) ruby-ole (1.2.12.2) ruby-progressbar (1.11.0) ruby2_keywords (0.0.5) @@ -373,8 +401,8 @@ GEM rack (< 2.1.0) rack-protection (>= 1.5.0) redis (>= 3.3.5, < 5) - sidekiq-cron (1.2.0) - fugit (~> 1.1) + sidekiq-cron (1.8.0) + fugit (~> 1) sidekiq (>= 4.2.1) simple_form (5.1.0) actionpack (>= 5.2) @@ -387,20 +415,21 @@ GEM rack (~> 2.0) rack-protection (= 2.0.8.1) tilt (~> 2.0) - solargraph (0.38.6) - backport (~> 1.1) + solargraph (0.47.2) + backport (~> 1.2) benchmark bundler (>= 1.17.2) + diff-lcs (~> 1.4) e2mmap jaro_winkler (~> 1.5) - maruku (~> 0.7, >= 0.7.3) - nokogiri (~> 1.9, >= 1.9.1) - parser (~> 2.3) - reverse_markdown (~> 1.0, >= 1.0.5) - rubocop (~> 0.52) + kramdown (~> 2.3) + kramdown-parser-gfm (~> 1.1) + parser (~> 3.0) + reverse_markdown (>= 1.0.5, < 3) + rubocop (>= 0.52) thor (~> 1.0) tilt (~> 2.0) - yard (~> 0.9) + yard (~> 0.9, >= 0.9.24) spreadsheet (1.3.0) ruby-ole spring (2.1.1) @@ -415,24 +444,23 @@ GEM activesupport (>= 5.2) sprockets (>= 3.0.0) thor (1.2.1) - thread_safe (0.3.6) tilt (2.0.11) turbolinks (5.2.1) turbolinks-source (~> 5.2) turbolinks-source (5.2.0) - tzinfo (1.2.10) - thread_safe (~> 0.1) + tzinfo (2.0.5) + concurrent-ruby (~> 1.0) uglifier (4.2.0) execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext unf_ext (0.0.8.2) - unicode-display_width (1.8.0) - web-console (3.7.0) - actionview (>= 5.0) - activemodel (>= 5.0) + unicode-display_width (2.3.0) + web-console (4.2.0) + actionview (>= 6.0.0) + activemodel (>= 6.0.0) bindex (>= 0.4.0) - railties (>= 5.0) + railties (>= 6.0.0) webrick (1.7.0) websocket-driver (0.7.5) websocket-extensions (>= 0.1.0) @@ -442,6 +470,7 @@ GEM nokogiri (~> 1.8) yard (0.9.28) webrick (~> 1.7.0) + zeitwerk (2.6.6) PLATFORMS ruby @@ -449,7 +478,7 @@ PLATFORMS DEPENDENCIES aasm active_decorator - acts-as-taggable-on (~> 6.0) + acts-as-taggable-on (~> 9.0) acts_as_list ancestry annotate (~> 2.6.0) @@ -483,7 +512,7 @@ DEPENDENCIES mysql2 (>= 0.4.4, < 0.6.0) nokogiri (~> 1.13.0) oauth2 - omniauth (~> 1.9.0) + omniauth (~> 1.9.2) omniauth-cas omniauth-oauth2 (~> 1.6.0) parallel (~> 1.19, >= 1.19.1) @@ -492,9 +521,9 @@ DEPENDENCIES puma (~> 5.6.5) rack-cors rack-mini-profiler - rails (~> 5.2.0) - rails-i18n (~> 5.1) - ransack + rails (~> 6.1.0) + rails-i18n (~> 7.0.6) + ransack (~> 3.0.1) rchardet (~> 1.8) redcarpet (~> 3.4) redis-rails @@ -504,18 +533,18 @@ DEPENDENCIES rqrcode (~> 0.10.1) rqrcode_png rspec-rails (~> 3.8) - rubocop (~> 0.52.0) + rubocop (~> 1.38.0) ruby-ole - rubyzip + rubyzip (~> 1.3.0) sass-rails (~> 5.0) searchkick selenium-webdriver (= 3.142.7) sidekiq (= 5.2.8) - sidekiq-cron (= 1.2.0) + sidekiq-cron (~> 1.8.0) simple_form simple_xlsx_reader sinatra - solargraph (~> 0.38.0) + solargraph (~> 0.47.2) spreadsheet spring spring-watcher-listen (~> 2.0.0)