[pull] dev from opf:dev

.github/workflows/danger.yml

@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.3.1'
+          ruby-version: '3.3.2'
       - uses: MeilCli/danger-action@v5
         with:
           danger_file: 'Dangerfile'

.ruby-version

@@ -1 +1 @@
-3.3.1
+3.3.2

Gemfile

@@ -157,9 +157,11 @@ 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 "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 "prawn", "~> 2.4"
 gem "ttfunk", "~> 1.7.0" # remove after https://github.com/prawnpdf/prawn/issues/1346 resolved.
+
 # prawn implicitly depends on matrix gem no longer in ruby core with 3.1
 gem "matrix", "~> 0.4.2"
 
@@ -228,6 +230,8 @@ gem "turbo-rails", "~> 2.0.0"
 
 gem "httpx"
 
+gem "gitlab_chronic_duration"
+
 group :test do
   gem "launchy", "~> 3.0.0"
   gem "rack-test", "~> 2.1.0"
@@ -384,6 +388,6 @@ gemfiles.each do |file|
   send(:eval_gemfile, file) if File.readable?(file)
 end
 
-gem "openproject-octicons", "~>19.13.0"
-gem "openproject-octicons_helper", "~>19.13.0"
-gem "openproject-primer_view_components", "~>0.32.1"
+gem "openproject-octicons", "~>19.14.0"
+gem "openproject-octicons_helper", "~>19.14.0"
+gem "openproject-primer_view_components", "~>0.33.1"

Gemfile.lock

@@ -226,35 +226,35 @@ GEM
   remote: https://rubygems.org/
   specs:
     Ascii85 (1.1.1)
-    actioncable (7.1.3.3)
-      actionpack (= 7.1.3.3)
-      activesupport (= 7.1.3.3)
+    actioncable (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.1.3.3)
-      actionpack (= 7.1.3.3)
-      activejob (= 7.1.3.3)
-      activerecord (= 7.1.3.3)
-      activestorage (= 7.1.3.3)
-      activesupport (= 7.1.3.3)
+    actionmailbox (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activestorage (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.1.3.3)
-      actionpack (= 7.1.3.3)
-      actionview (= 7.1.3.3)
-      activejob (= 7.1.3.3)
-      activesupport (= 7.1.3.3)
+    actionmailer (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      actionview (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.2)
-    actionpack (7.1.3.3)
-      actionview (= 7.1.3.3)
-      activesupport (= 7.1.3.3)
+    actionpack (7.1.3.4)
+      actionview (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       nokogiri (>= 1.8.5)
       racc
       rack (>= 2.2.4)
@@ -265,31 +265,31 @@ GEM
     actionpack-xml_parser (2.0.1)
       actionpack (>= 5.0)
       railties (>= 5.0)
-    actiontext (7.1.3.3)
-      actionpack (= 7.1.3.3)
-      activerecord (= 7.1.3.3)
-      activestorage (= 7.1.3.3)
-      activesupport (= 7.1.3.3)
+    actiontext (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activestorage (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.1.3.3)
-      activesupport (= 7.1.3.3)
+    actionview (7.1.3.4)
+      activesupport (= 7.1.3.4)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activejob (7.1.3.3)
-      activesupport (= 7.1.3.3)
+    activejob (7.1.3.4)
+      activesupport (= 7.1.3.4)
       globalid (>= 0.3.6)
-    activemodel (7.1.3.3)
-      activesupport (= 7.1.3.3)
+    activemodel (7.1.3.4)
+      activesupport (= 7.1.3.4)
     activemodel-serializers-xml (1.0.2)
       activemodel (> 5.x)
       activesupport (> 5.x)
       builder (~> 3.1)
-    activerecord (7.1.3.3)
-      activemodel (= 7.1.3.3)
-      activesupport (= 7.1.3.3)
+    activerecord (7.1.3.4)
+      activemodel (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       timeout (>= 0.4.0)
     activerecord-import (1.7.0)
       activerecord (>= 4.2)
@@ -302,13 +302,13 @@ GEM
       multi_json (~> 1.11, >= 1.11.2)
       rack (>= 2.0.8, < 4)
       railties (>= 6.1)
-    activestorage (7.1.3.3)
-      actionpack (= 7.1.3.3)
-      activejob (= 7.1.3.3)
-      activerecord (= 7.1.3.3)
-      activesupport (= 7.1.3.3)
+    activestorage (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       marcel (~> 1.0)
-    activesupport (7.1.3.3)
+    activesupport (7.1.3.4)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -420,11 +420,11 @@ GEM
       descendants_tracker (~> 0.0.1)
     color_conversion (0.1.1)
     colored2 (4.0.0)
-    commonmarker (1.1.3)
+    commonmarker (1.1.4)
       rb_sys (~> 0.9)
     compare-xml (0.66)
       nokogiri (~> 1.8)
-    concurrent-ruby (1.2.3)
+    concurrent-ruby (1.3.1)
     connection_pool (2.4.1)
     cookiejar (0.3.4)
     cose (1.3.0)
@@ -529,7 +529,7 @@ GEM
       concurrent-ruby (~> 1.1)
       webrick (~> 1.7)
       websocket-driver (>= 0.6, < 0.8)
-    ffi (1.16.3)
+    ffi (1.17.0)
     flamegraph (0.9.5)
     fog-aws (3.22.0)
       fog-core (~> 2.1)
@@ -556,6 +556,8 @@ GEM
     fuubar (2.5.1)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
+    gitlab_chronic_duration (0.12.0)
+      numerizer (~> 0.2)
     glob (0.4.0)
     globalid (1.2.1)
       activesupport (>= 6.1)
@@ -670,7 +672,7 @@ GEM
     launchy (3.0.1)
       addressable (~> 2.8)
       childprocess (~> 5.0)
-    lefthook (1.6.14)
+    lefthook (1.6.15)
     letter_opener (1.10.0)
       launchy (>= 2.2, < 4)
     letter_opener_web (3.0.0)
@@ -722,7 +724,7 @@ GEM
     mime-types-data (3.2024.0507)
     mini_magick (4.12.0)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.6)
+    mini_portile2 (2.8.7)
     minitest (5.23.1)
     msgpack (1.7.2)
     multi_json (1.15.0)
@@ -733,7 +735,7 @@ GEM
     mutex_m (0.2.0)
     net-http (0.4.1)
       uri
-    net-imap (0.4.11)
+    net-imap (0.4.12)
       date
       net-protocol
     net-ldap (0.19.0)
@@ -747,6 +749,7 @@ GEM
     nokogiri (1.16.5)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
+    numerizer (0.2.0)
     oj (3.16.3)
       bigdecimal (>= 3.0)
     okcomputer (1.18.5)
@@ -767,12 +770,12 @@ GEM
       validate_email
       validate_url
       webfinger (~> 2.0)
-    openproject-octicons (19.13.0)
-    openproject-octicons_helper (19.13.0)
+    openproject-octicons (19.14.0)
+    openproject-octicons_helper (19.14.0)
       actionview
-      openproject-octicons (= 19.13.0)
+      openproject-octicons (= 19.14.0)
       railties
-    openproject-primer_view_components (0.32.1)
+    openproject-primer_view_components (0.33.1)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
       openproject-octicons (>= 19.12.0)
@@ -873,20 +876,20 @@ GEM
     rackup (1.0.0)
       rack (< 3)
       webrick
-    rails (7.1.3.3)
-      actioncable (= 7.1.3.3)
-      actionmailbox (= 7.1.3.3)
-      actionmailer (= 7.1.3.3)
-      actionpack (= 7.1.3.3)
-      actiontext (= 7.1.3.3)
-      actionview (= 7.1.3.3)
-      activejob (= 7.1.3.3)
-      activemodel (= 7.1.3.3)
-      activerecord (= 7.1.3.3)
-      activestorage (= 7.1.3.3)
-      activesupport (= 7.1.3.3)
+    rails (7.1.3.4)
+      actioncable (= 7.1.3.4)
+      actionmailbox (= 7.1.3.4)
+      actionmailer (= 7.1.3.4)
+      actionpack (= 7.1.3.4)
+      actiontext (= 7.1.3.4)
+      actionview (= 7.1.3.4)
+      activejob (= 7.1.3.4)
+      activemodel (= 7.1.3.4)
+      activerecord (= 7.1.3.4)
+      activestorage (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       bundler (>= 1.15.0)
-      railties (= 7.1.3.3)
+      railties (= 7.1.3.4)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -901,9 +904,9 @@ GEM
     rails-i18n (7.0.9)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
-    railties (7.1.3.3)
-      actionpack (= 7.1.3.3)
-      activesupport (= 7.1.3.3)
+    railties (7.1.3.4)
+      actionpack (= 7.1.3.4)
+      activesupport (= 7.1.3.4)
       irb
       rackup (>= 1.0.0)
       rake (>= 12.2)
@@ -925,7 +928,7 @@ GEM
     redis-client (0.22.2)
       connection_pool
     regexp_parser (2.9.2)
-    reline (0.5.7)
+    reline (0.5.8)
       io-console (~> 0.5)
     representable (3.2.0)
       declarative (< 0.1.0)
@@ -996,7 +999,7 @@ GEM
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (2.29.2)
+    rubocop-rspec (2.30.0)
       rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
@@ -1081,7 +1084,7 @@ GEM
     text-hyphen (1.5.0)
     thor (1.3.1)
     thread_safe (0.3.6)
-    timecop (0.9.8)
+    timecop (0.9.9)
     timeout (0.4.1)
     tpm-key_attestation (0.12.0)
       bindata (~> 2.4)
@@ -1150,7 +1153,7 @@ GEM
     xpath (3.2.0)
       nokogiri (~> 1.8)
     yard (0.9.36)
-    zeitwerk (2.6.14)
+    zeitwerk (2.6.15)
 
 PLATFORMS
   ruby
@@ -1211,6 +1214,7 @@ DEPENDENCIES
   fog-aws
   friendly_id (~> 5.5.0)
   fuubar (~> 2.5.0)
+  gitlab_chronic_duration
   gon (~> 6.4.0)
   good_job (= 3.26.2)
   google-apis-gmail_v1
@@ -1233,6 +1237,7 @@ DEPENDENCIES
   lograge (~> 0.14.0)
   lookbook (~> 2.3.0)
   mail (= 2.8.1)
+  markly (~> 0.10)
   matrix (~> 0.4.2)
   md_to_pdf!
   meta-tags (~> 2.21.0)
@@ -1262,10 +1267,10 @@ DEPENDENCIES
   openproject-job_status!
   openproject-ldap_groups!
   openproject-meeting!
-  openproject-octicons (~> 19.13.0)
-  openproject-octicons_helper (~> 19.13.0)
+  openproject-octicons (~> 19.14.0)
+  openproject-octicons_helper (~> 19.14.0)
   openproject-openid_connect!
-  openproject-primer_view_components (~> 0.32.1)
+  openproject-primer_view_components (~> 0.33.1)
   openproject-recaptcha!
   openproject-reporting!
   openproject-storages!
@@ -1355,7 +1360,7 @@ DEPENDENCIES
   with_advisory_lock (~> 5.1.0)
 
 RUBY VERSION
-   ruby 3.3.1p55
+   ruby 3.3.2p78
 
 BUNDLED WITH
-   2.5.10
+   2.5.11

app/components/_index.sass

@@ -2,6 +2,7 @@
 @import "work_packages/share/invite_user_form_component"
 @import "work_packages/progress/modal_body_component"
 @import "open_project/common/attribute_component"
-@import "filters_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"

app/components/filter/filter_button_component.html.erb

@@ -0,0 +1,8 @@
+<%= render(Primer::Beta::Button.new(scheme: :secondary,
+                                    disabled:,
+                                    data: { "filters-target": "filterFormToggle",
+                                            action: "filters#toggleDisplayFilters" },
+                                    test_selector: "filter-component-toggle")) do |button| %>
+  <% button.with_trailing_visual_counter(count: filters_count, test_selector: "filters-button-counter") %>
+  <%= t(:label_filter) %>
+<% end %>