Merge branch 'dev' into task/53048-134-documentation-virus-scanning-f…

…unctionality
opf · Mar 6, 2024 · 7f685d1 · 7f685d1
2 parents f75f2a0 + 9f3e4c4
commit 7f685d1
Show file tree

Hide file tree

Showing 432 changed files with 7,017 additions and 3,315 deletions.
diff --git a/Gemfile b/Gemfile
@@ -124,8 +124,7 @@ gem 'multi_json', '~> 1.15.0'
 gem 'oj', '~> 3.16.0'
 
 gem 'daemons'
-gem 'delayed_cron_job', '~> 0.9.0'
-gem 'delayed_job_active_record', '~> 4.1.5'
+gem 'good_job', '~> 3.26.1' # update should be done manually in sync with saas-openproject version.
 
 gem 'rack-protection', '~> 3.2.0'
 
@@ -156,7 +155,7 @@ gem 'structured_warnings', '~> 0.4.0'
 # don't require by default, instead load on-demand when actually configured
 gem 'airbrake', '~> 13.0.0', require: false
 
-gem 'md_to_pdf', git: 'https://github.com/opf/md-to-pdf', ref: '82c2b5cc25a28fbd62cb05b17d9ba0f68d701109'
+gem 'md_to_pdf', git: 'https://github.com/opf/md-to-pdf', ref: '8f14736a88ad0064d2a97be108fe7061ffbcee91'
 gem 'prawn', '~> 2.4'
 # prawn implicitly depends on matrix gem no longer in ruby core with 3.1
 gem 'matrix', '~> 0.4.2'
@@ -227,7 +226,7 @@ gem 'turbo-rails', '~> 2.0.0'
 gem 'httpx'
 
 group :test do
-  gem 'launchy', '~> 2.5.0'
+  gem 'launchy', '~> 3.0.0'
   gem 'rack-test', '~> 2.1.0'
   gem 'shoulda-context', '~> 2.0'
 
@@ -291,7 +290,7 @@ group :ldap do
 end
 
 group :development do
-  gem 'listen', '~> 3.8.0' # Use for event-based reloaders
+  gem 'listen', '~> 3.9.0' # Use for event-based reloaders
 
   gem 'letter_opener'
 
@@ -348,7 +347,7 @@ gem 'grape_logging', '~> 1.8.4'
 gem 'roar', '~> 1.2.0'
 
 # CORS for API
-gem 'rack-cors', '~> 2.0.0'
+gem 'rack-cors', '~> 2.0.2'
 
 # Gmail API
 gem 'google-apis-gmail_v1', require: false
@@ -384,4 +383,4 @@ end
 
 gem 'openproject-octicons', '~>19.8.0'
 gem 'openproject-octicons_helper', '~>19.8.0'
-gem 'openproject-primer_view_components', '~>0.22.2'
+gem 'openproject-primer_view_components', '~>0.23.0'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/citizensadvice/capybara_accessible_selectors
-  revision: 67bbac702fd039a81ce858f1157701b5a5b70cd1
+  revision: f9a7261a3c44cead8b40cbc4353c242a2b0ca388
   branch: main
   specs:
     capybara_accessible_selectors (0.11.0)
@@ -25,16 +25,16 @@ GIT
 
 GIT
   remote: https://github.com/opf/md-to-pdf
-  revision: 82c2b5cc25a28fbd62cb05b17d9ba0f68d701109
-  ref: 82c2b5cc25a28fbd62cb05b17d9ba0f68d701109
+  revision: 8f14736a88ad0064d2a97be108fe7061ffbcee91
+  ref: 8f14736a88ad0064d2a97be108fe7061ffbcee91
   specs:
-    md_to_pdf (0.0.25)
+    md_to_pdf (0.0.26)
       color_conversion (~> 0.1)
       front_matter_parser (~> 1.0)
       json-schema (~> 4.1)
       markly (~> 0.10)
       matrix (~> 0.4)
-      nokogiri (~> 1.16)
+      nokogiri (~> 1.1)
       prawn (~> 2.4)
       prawn-table (~> 0.2)
       text-hyphen (~> 1.5)
@@ -331,7 +331,7 @@ GEM
       airbrake-ruby (~> 6.0)
     airbrake-ruby (6.2.2)
       rbtree3 (~> 0.6)
-    appsignal (3.6.0)
+    appsignal (3.6.1)
       rack
     ast (2.4.2)
     attr_required (1.0.2)
@@ -340,7 +340,7 @@ GEM
     awesome_nested_set (3.6.0)
       activerecord (>= 4.0.0, < 7.2)
     aws-eventstream (1.3.0)
-    aws-partitions (1.894.0)
+    aws-partitions (1.895.0)
     aws-sdk-core (3.191.3)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
@@ -408,6 +408,7 @@ GEM
       carrierwave (>= 1.0.0)
       fog-aws
     cgi (0.4.1)
+    childprocess (5.0.0)
     climate_control (1.2.0)
     closure_tree (7.4.0)
       activerecord (>= 4.2.10)
@@ -442,16 +443,9 @@ GEM
     debug (1.9.1)
       irb (~> 1.10)
       reline (>= 0.3.8)
-    deckar01-task_list (2.3.3)
-      html-pipeline
+    deckar01-task_list (2.3.4)
+      html-pipeline (~> 2.0)
     declarative (0.0.20)
-    delayed_cron_job (0.9.0)
-      fugit (>= 1.5)
-    delayed_job (4.1.11)
-      activesupport (>= 3.0, < 8.0)
-    delayed_job_active_record (4.1.8)
-      activerecord (>= 3.0, < 8.0)
-      delayed_job (>= 3.0, < 5)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.5.1)
@@ -464,8 +458,7 @@ GEM
     dotenv-rails (3.1.0)
       dotenv (= 3.1.0)
       railties (>= 6.1)
-    drb (2.2.0)
-      ruby2_keywords
+    drb (2.2.1)
     dry-container (0.11.0)
       concurrent-ruby (~> 1.0)
     dry-core (1.0.1)
@@ -551,7 +544,7 @@ GEM
     friendly_id (5.5.1)
       activerecord (>= 4.0.0)
     front_matter_parser (1.0.1)
-    fugit (1.9.0)
+    fugit (1.10.1)
       et-orbi (~> 1, >= 1.2.7)
       raabro (~> 1.4)
     fuubar (2.5.1)
@@ -565,6 +558,13 @@ GEM
       i18n (>= 0.7)
       multi_json
       request_store (>= 1.0)
+    good_job (3.26.1)
+      activejob (>= 6.0.0)
+      activerecord (>= 6.0.0)
+      concurrent-ruby (>= 1.0.2)
+      fugit (>= 1.1)
+      railties (>= 6.0.0)
+      thor (>= 0.14.1)
     google-apis-core (0.14.0)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (~> 1.9)
@@ -609,7 +609,7 @@ GEM
     http-2-next (1.0.3)
     http_parser.rb (0.6.0)
     httpclient (2.8.3)
-    httpx (1.2.2)
+    httpx (1.2.3)
       http-2-next (>= 1.0.3)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
@@ -639,7 +639,7 @@ GEM
     iso8601 (0.13.0)
     jmespath (1.6.2)
     json (2.7.1)
-    json-jwt (1.16.5)
+    json-jwt (1.16.6)
       activesupport (>= 4.2)
       aes_key_wrap
       base64
@@ -655,17 +655,18 @@ GEM
     json_spec (1.1.5)
       multi_json (~> 1.0)
       rspec (>= 2.0, < 4.0)
-    jwt (2.8.0)
+    jwt (2.8.1)
       base64
     ladle (1.0.1)
       open4 (~> 1.0)
     language_server-protocol (3.17.0.3)
-    launchy (2.5.2)
+    launchy (3.0.0)
       addressable (~> 2.8)
-    lefthook (1.6.4)
-    letter_opener (1.9.0)
-      launchy (>= 2.2, < 3)
-    listen (3.8.0)
+      childprocess (~> 5.0)
+    lefthook (1.6.5)
+    letter_opener (1.0.0)
+      launchy (>= 2.0.4)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     lobby_boy (0.1.3)
@@ -697,7 +698,7 @@ GEM
       net-imap
       net-pop
       net-smtp
-    marcel (1.0.2)
+    marcel (1.0.4)
     markly (0.10.0)
     matrix (0.4.2)
     messagebird-rest (1.4.2)
@@ -758,7 +759,7 @@ GEM
       actionview
       openproject-octicons (= 19.8.0)
       railties
-    openproject-primer_view_components (0.22.2)
+    openproject-primer_view_components (0.23.0)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
       openproject-octicons (>= 19.8.0)
@@ -771,12 +772,12 @@ GEM
       activerecord (>= 6.1)
       request_store (~> 1.4)
     parallel (1.24.0)
-    parallel_tests (4.5.1)
+    parallel_tests (4.5.2)
       parallel
     parser (3.3.0.5)
       ast (~> 2.4.1)
       racc
-    pdf-core (0.9.0)
+    pdf-core (0.10.0)
     pdf-inspector (1.3.0)
       pdf-reader (>= 1.0, < 3.0.a)
     pdf-reader (2.12.0)
@@ -785,17 +786,17 @@ GEM
       hashery (~> 2.0)
       ruby-rc4
       ttfunk
-    pg (1.5.5)
+    pg (1.5.6)
     plaintext (0.3.4)
       activesupport (> 2.2.1)
       nokogiri (~> 1.10, >= 1.10.4)
       rubyzip (>= 1.2.0)
-    prawn (2.4.0)
-      pdf-core (~> 0.9.0)
-      ttfunk (~> 1.7)
+    prawn (2.5.0)
+      matrix (~> 0.4)
+      pdf-core (~> 0.10.0)
+      ttfunk (~> 1.8)
     prawn-table (0.2.2)
       prawn (>= 1.3.0, < 3.0.0)
-    prism (0.24.0)
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -832,7 +833,7 @@ GEM
       rack (>= 0.4)
     rack-attack (6.7.0)
       rack (>= 1.0, < 4)
-    rack-cors (2.0.1)
+    rack-cors (2.0.2)
       rack (>= 2.0.0)
     rack-mini-profiler (3.3.1)
       rack (>= 1.2.0)
@@ -898,7 +899,7 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rb_sys (0.9.88)
+    rb_sys (0.9.90)
     rbtree3 (0.7.1)
     rdoc (6.6.2)
       psych (>= 4.0.0)
@@ -949,7 +950,7 @@ GEM
       rspec-support (~> 3.12)
     rspec-retry (0.6.2)
       rspec-core (> 3.3)
-    rspec-support (3.13.0)
+    rspec-support (3.13.1)
     rubocop (1.61.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
@@ -961,9 +962,8 @@ GEM
       rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.0)
+    rubocop-ast (1.31.1)
       parser (>= 3.3.0.4)
-      prism (>= 0.24.0)
     rubocop-capybara (2.20.0)
       rubocop (~> 1.41)
     rubocop-factory_bot (2.25.1)
@@ -975,12 +975,12 @@ GEM
     rubocop-performance (1.20.2)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.30.0, < 2.0)
-    rubocop-rails (2.23.1)
+    rubocop-rails (2.24.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
-    rubocop-rspec (2.27.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    rubocop-rspec (2.27.1)
       rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
@@ -1062,7 +1062,8 @@ GEM
     timecop (0.9.8)
     timeout (0.4.1)
     trailblazer-option (0.1.2)
-    ttfunk (1.7.0)
+    ttfunk (1.8.0)
+      bigdecimal (~> 3.1)
     turbo-rails (2.0.4)
       actionpack (>= 6.0.0)
       activejob (>= 6.0.0)
@@ -1117,7 +1118,7 @@ GEM
       zeitwerk (>= 2.6)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    yard (0.9.35)
+    yard (0.9.36)
     zeitwerk (2.6.13)
 
 PLATFORMS
@@ -1163,8 +1164,6 @@ DEPENDENCIES
   date_validator (~> 0.12.0)
   debug
   deckar01-task_list (~> 2.3.1)
-  delayed_cron_job (~> 0.9.0)
-  delayed_job_active_record (~> 4.1.5)
   disposable (~> 0.6.2)
   doorkeeper (~> 5.6.6)
   dotenv-rails
@@ -1182,6 +1181,7 @@ DEPENDENCIES
   friendly_id (~> 5.5.0)
   fuubar (~> 2.5.0)
   gon (~> 6.4.0)
+  good_job (~> 3.26.1)
   google-apis-gmail_v1
   googleauth
   grape (~> 2.0.0)
@@ -1195,10 +1195,10 @@ DEPENDENCIES
   json_schemer (~> 2.1.0)
   json_spec (~> 1.1.4)
   ladle
-  launchy (~> 2.5.0)
+  launchy (~> 3.0.0)
   lefthook
   letter_opener
-  listen (~> 3.8.0)
+  listen (~> 3.9.0)
   lograge (~> 0.14.0)
   lookbook (~> 2.2.1)
   mail (= 2.8.1)
@@ -1232,7 +1232,7 @@ DEPENDENCIES
   openproject-octicons (~> 19.8.0)
   openproject-octicons_helper (~> 19.8.0)
   openproject-openid_connect!
-  openproject-primer_view_components (~> 0.22.2)
+  openproject-primer_view_components (~> 0.23.0)
   openproject-recaptcha!
   openproject-reporting!
   openproject-storages!
@@ -1257,7 +1257,7 @@ DEPENDENCIES
   puma (~> 6.4)
   puma-plugin-statsd (~> 2.0)
   rack-attack (~> 6.7.0)
-  rack-cors (~> 2.0.0)
+  rack-cors (~> 2.0.2)
   rack-mini-profiler
   rack-protection (~> 3.2.0)
   rack-test (~> 2.1.0)

diff --git a/Procfile.dev b/Procfile.dev
@@ -1,3 +1,3 @@
 web: bundle exec rails server -p 3000 -b ${HOST:="127.0.0.1"} --environment ${RAILS_ENV:="development"}
 angular: npm run serve
-worker: bundle exec rake jobs:work
+worker: bundle exec good_job start