Merge branch 'dev' into merge-release/14.2-20240620033423

opf · Jun 20, 2024 · 3e259ec · 3e259ec
2 parents a1b8220 + c3e8b5d
commit 3e259ec
Show file tree

Hide file tree

Showing 656 changed files with 5,785 additions and 4,702 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -8,7 +8,6 @@ require:
   - rubocop-capybara
   - rubocop-factory_bot
   - rubocop-performance
-  - rubocop-inflector
   - ./config/initializers/inflections.rb
 
 <% if File.exist?('.rubocop-local.yml') %>
@@ -237,6 +236,10 @@ RSpec/DescribeMethod:
 RSpec/SpecFilePathFormat:
   IgnoreMethods: true
 
+# Disable deprecated cop
+RSpec/FilePath:
+  Enabled: false
+
 # Prevent  "fit" or similar to be committed
 RSpec/Focus:
   Enabled: true

diff --git a/Gemfile b/Gemfile
@@ -158,7 +158,7 @@ gem "structured_warnings", "~> 0.4.0"
 gem "airbrake", "~> 13.0.0", require: false
 
 gem "markly", "~> 0.10" # another markdown parser like commonmarker, but with AST support used in PDF export
-gem "md_to_pdf", git: "https://github.com/opf/md-to-pdf", ref: "8f14736a88ad0064d2a97be108fe7061ffbcee91"
+gem "md_to_pdf", git: "https://github.com/opf/md-to-pdf", ref: "8772c791a21819751c0d111be903b3b44ef7d862"
 gem "prawn", "~> 2.4"
 gem "ttfunk", "~> 1.7.0" # remove after https://github.com/prawnpdf/prawn/issues/1346 resolved.
 
@@ -182,7 +182,7 @@ gem "i18n-js", "~> 4.2.3"
 gem "rails-i18n", "~> 7.0.0"
 
 gem "sprockets", "~> 3.7.2" # lock sprockets below 4.0
-gem "sprockets-rails", "~> 3.4.2"
+gem "sprockets-rails", "~> 3.5.1"
 
 gem "puma", "~> 6.4"
 gem "puma-plugin-statsd", "~> 2.0"
@@ -328,10 +328,12 @@ group :development, :test do
 
   # ruby linting
   gem "rubocop", require: false
-  gem "rubocop-inflector", require: false
+  gem "rubocop-capybara", require: false
+  gem "rubocop-factory_bot", require: false
   gem "rubocop-performance", require: false
   gem "rubocop-rails", require: false
   gem "rubocop-rspec", require: false
+  gem "rubocop-rspec_rails", require: false
 
   # erb linting
   gem "erb_lint", require: false
@@ -386,6 +388,6 @@ gemfiles.each do |file|
   send(:eval_gemfile, file) if File.readable?(file)
 end
 
-gem "openproject-octicons", "~>19.14.0"
-gem "openproject-octicons_helper", "~>19.14.0"
-gem "openproject-primer_view_components", "~>0.33.1"
+gem "openproject-octicons", "~>19.14.1"
+gem "openproject-octicons_helper", "~>19.14.1"
+gem "openproject-primer_view_components", "~>0.34.0"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -8,13 +8,13 @@ GIT
 
 GIT
   remote: https://github.com/opf/md-to-pdf
-  revision: 8f14736a88ad0064d2a97be108fe7061ffbcee91
-  ref: 8f14736a88ad0064d2a97be108fe7061ffbcee91
+  revision: 8772c791a21819751c0d111be903b3b44ef7d862
+  ref: 8772c791a21819751c0d111be903b3b44ef7d862
   specs:
-    md_to_pdf (0.0.26)
+    md_to_pdf (0.0.27)
       color_conversion (~> 0.1)
       front_matter_parser (~> 1.0)
-      json-schema (~> 4.1)
+      json-schema (~> 4.3)
       markly (~> 0.10)
       matrix (~> 0.4)
       nokogiri (~> 1.1)
@@ -341,17 +341,17 @@ GEM
       activerecord (>= 4.0.0, < 7.2)
     awrence (1.2.1)
     aws-eventstream (1.3.0)
-    aws-partitions (1.934.0)
-    aws-sdk-core (3.196.1)
+    aws-partitions (1.944.0)
+    aws-sdk-core (3.197.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.8)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.82.0)
-      aws-sdk-core (~> 3, >= 3.193.0)
+    aws-sdk-kms (1.84.0)
+      aws-sdk-core (~> 3, >= 3.197.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.151.0)
-      aws-sdk-core (~> 3, >= 3.194.0)
+    aws-sdk-s3 (1.152.3)
+      aws-sdk-core (~> 3, >= 3.197.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)
     aws-sdk-sns (1.75.0)
@@ -386,7 +386,7 @@ GEM
     brakeman (6.1.2)
       racc
     browser (6.0.0)
-    builder (3.2.4)
+    builder (3.3.0)
     byebug (11.1.3)
     capybara (3.40.0)
       addressable
@@ -531,7 +531,7 @@ GEM
       websocket-driver (>= 0.6, < 0.8)
     ffi (1.17.0)
     flamegraph (0.9.5)
-    fog-aws (3.22.0)
+    fog-aws (3.23.0)
       fog-core (~> 2.1)
       fog-json (~> 1.1)
       fog-xml (~> 0.1)
@@ -615,7 +615,7 @@ GEM
     http-2-next (1.0.3)
     http_parser.rb (0.6.0)
     httpclient (2.8.3)
-    httpx (1.2.5)
+    httpx (1.2.6)
       http-2-next (>= 1.0.3)
     i18n (1.14.5)
       concurrent-ruby (~> 1.0)
@@ -670,7 +670,7 @@ GEM
     launchy (3.0.1)
       addressable (~> 2.8)
       childprocess (~> 5.0)
-    lefthook (1.6.15)
+    lefthook (1.6.16)
     letter_opener (1.10.0)
       launchy (>= 2.2, < 4)
     letter_opener_web (3.0.0)
@@ -719,7 +719,7 @@ GEM
     method_source (1.1.0)
     mime-types (3.5.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2024.0507)
+    mime-types-data (3.2024.0604)
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.7)
@@ -744,10 +744,10 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.3)
-    nokogiri (1.16.5)
+    nokogiri (1.16.6)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    oj (3.16.3)
+    oj (3.16.4)
       bigdecimal (>= 3.0)
     okcomputer (1.18.5)
     omniauth-saml (1.10.3)
@@ -767,12 +767,12 @@ GEM
       validate_email
       validate_url
       webfinger (~> 2.0)
-    openproject-octicons (19.14.0)
-    openproject-octicons_helper (19.14.0)
+    openproject-octicons (19.14.1)
+    openproject-octicons_helper (19.14.1)
       actionview
-      openproject-octicons (= 19.14.0)
+      openproject-octicons (= 19.14.1)
       railties
-    openproject-primer_view_components (0.33.1)
+    openproject-primer_view_components (0.34.0)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
       openproject-octicons (>= 19.12.0)
@@ -787,10 +787,10 @@ GEM
     paper_trail (15.1.0)
       activerecord (>= 6.1)
       request_store (~> 1.4)
-    parallel (1.24.0)
+    parallel (1.25.1)
     parallel_tests (4.7.1)
       parallel
-    parser (3.3.2.0)
+    parser (3.3.3.0)
       ast (~> 2.4.1)
       racc
     pdf-core (0.9.0)
@@ -918,7 +918,7 @@ GEM
     rbtree3 (0.7.1)
     rdoc (6.7.0)
       psych (>= 4.0.0)
-    recaptcha (5.16.0)
+    recaptcha (5.17.0)
     redcarpet (3.6.0)
     redis (5.2.0)
       redis-client (>= 0.22.0)
@@ -937,8 +937,8 @@ GEM
       actionpack (>= 5.2)
       railties (>= 5.2)
     retriable (3.1.2)
-    rexml (3.2.8)
-      strscan (>= 3.0.9)
+    rexml (3.3.0)
+      strscan
     rinku (2.0.6)
     roar (1.2.0)
       representable (~> 3.1)
@@ -980,29 +980,23 @@ GEM
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.31.3)
       parser (>= 3.3.1.0)
-    rubocop-capybara (2.20.0)
-      rubocop (~> 1.41)
-    rubocop-factory_bot (2.25.1)
+    rubocop-capybara (2.21.0)
       rubocop (~> 1.41)
-    rubocop-inflector (0.2.1)
-      activesupport
-      rubocop
-      rubocop-rspec
-    rubocop-performance (1.21.0)
+    rubocop-factory_bot (2.26.1)
+      rubocop (~> 1.61)
+    rubocop-performance (1.21.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-rails (2.25.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (2.30.0)
-      rubocop (~> 1.40)
-      rubocop-capybara (~> 2.17)
-      rubocop-factory_bot (~> 2.22)
-      rubocop-rspec_rails (~> 2.28)
-    rubocop-rspec_rails (2.28.3)
-      rubocop (~> 1.40)
+    rubocop-rspec (3.0.1)
+      rubocop (~> 1.61)
+    rubocop-rspec_rails (2.30.0)
+      rubocop (~> 1.61)
+      rubocop-rspec (~> 3, >= 3.0.1)
     ruby-duration (3.2.3)
       activesupport (>= 3.0.0)
       i18n
@@ -1020,7 +1014,7 @@ GEM
     rubyzip (2.3.2)
     safety_net_attestation (0.4.0)
       jwt (~> 2.0)
-    sanitize (6.1.0)
+    sanitize (6.1.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     secure_headers (6.5.0)
@@ -1054,9 +1048,9 @@ GEM
       base64
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.4.2)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
+    sprockets-rails (3.5.1)
+      actionpack (>= 6.1)
+      activesupport (>= 6.1)
       sprockets (>= 3.0.0)
     ssrf_filter (1.0.8)
     stackprof (0.2.26)
@@ -1081,7 +1075,7 @@ GEM
     text-hyphen (1.5.0)
     thor (1.3.1)
     thread_safe (0.3.6)
-    timecop (0.9.9)
+    timecop (0.9.10)
     timeout (0.4.1)
     tpm-key_attestation (0.12.0)
       bindata (~> 2.4)
@@ -1143,7 +1137,7 @@ GEM
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    will_paginate (4.0.0)
+    will_paginate (4.0.1)
     with_advisory_lock (5.1.0)
       activerecord (>= 6.1)
       zeitwerk (>= 2.6)
@@ -1263,10 +1257,10 @@ DEPENDENCIES
   openproject-job_status!
   openproject-ldap_groups!
   openproject-meeting!
-  openproject-octicons (~> 19.14.0)
-  openproject-octicons_helper (~> 19.14.0)
+  openproject-octicons (~> 19.14.1)
+  openproject-octicons_helper (~> 19.14.1)
   openproject-openid_connect!
-  openproject-primer_view_components (~> 0.33.1)
+  openproject-primer_view_components (~> 0.34.0)
   openproject-recaptcha!
   openproject-reporting!
   openproject-storages!
@@ -1312,10 +1306,12 @@ DEPENDENCIES
   rspec-rails (~> 6.1.0)
   rspec-retry (~> 0.6.1)
   rubocop
-  rubocop-inflector
+  rubocop-capybara
+  rubocop-factory_bot
   rubocop-performance
   rubocop-rails
   rubocop-rspec
+  rubocop-rspec_rails
   ruby-duration (~> 3.2.0)
   ruby-prof
   ruby-progressbar (~> 1.13.0)
@@ -1331,7 +1327,7 @@ DEPENDENCIES
   spring-commands-rspec
   spring-commands-rubocop
   sprockets (~> 3.7.2)
-  sprockets-rails (~> 3.4.2)
+  sprockets-rails (~> 3.5.1)
   stackprof
   store_attribute (~> 1.0)
   stringex (~> 2.8.5)

diff --git a/app/components/_index.sass b/app/components/_index.sass
@@ -3,6 +3,5 @@
 @import "work_packages/progress/modal_body_component"
 @import "open_project/common/attribute_component"
 @import "filter/filters_component"
-@import "projects/settings/project_custom_field_sections/index_component"
 @import "projects/row_component"
 @import "settings/project_custom_fields/project_custom_field_mapping/new_project_mapping_component"
diff --git a/app/components/filter/filter_button_component.html.erb b/app/components/filter/filter_button_component.html.erb
@@ -1,7 +1,7 @@
 <%= render(Primer::Beta::Button.new(scheme: :secondary,
                                     disabled:,
-                                    data: { "filters-target": "filterFormToggle",
-                                            action: "filters#toggleDisplayFilters" },
+                                    data: { "filter--filters-form-target": "filterFormToggle",
+                                            action: "filter--filters-form#toggleDisplayFilters" },
                                     test_selector: "filter-component-toggle")) do |button| %>
   <% button.with_trailing_visual_counter(count: filters_count, test_selector: "filters-button-counter") %>
   <%= t(:label_filter) %>