Merge branch 'dev' into implementation/55178-replace-sidemenu-of-team…

…-planner-page-with-rails-component

.github/workflows/danger.yml

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

.ruby-version

@@ -1 +1 @@
-3.3.2
+3.3.3

Gemfile

@@ -59,7 +59,7 @@ gem "will_paginate", "~> 4.0.0"
 
 gem "friendly_id", "~> 5.5.0"
 
-gem "acts_as_list", "~> 1.1.0"
+gem "acts_as_list", "~> 1.2.0"
 gem "acts_as_tree", "~> 2.9.0"
 gem "awesome_nested_set", "~> 3.6.0"
 gem "closure_tree", "~> 7.4.0"
@@ -93,7 +93,7 @@ gem "deckar01-task_list", "~> 2.3.1"
 # Requires escape-utils for faster escaping
 gem "escape_utils", "~> 1.3"
 # Syntax highlighting used in html-pipeline with rouge
-gem "rouge", "~> 4.2.0"
+gem "rouge", "~> 4.3.0"
 # HTML sanitization used for html-pipeline
 gem "sanitize", "~> 6.1.0"
 # HTML autolinking for mails and urls (replaces autolink)
@@ -107,7 +107,7 @@ gem "svg-graph", "~> 2.2.0"
 
 gem "date_validator", "~> 0.12.0"
 gem "email_validator", "~> 2.2.3"
-gem "json_schemer", "~> 2.2.0"
+gem "json_schemer", "~> 2.3.0"
 gem "ruby-duration", "~> 3.2.0"
 
 # `config/initializers/mail_starttls_patch.rb` has also been patched to
@@ -118,7 +118,7 @@ gem "mail", "= 2.8.1"
 gem "csv", "~> 3.3"
 
 # provide compatible filesystem information for available storage
-gem "sys-filesystem", "~> 1.4.0", require: false
+gem "sys-filesystem", "~> 1.5.0", require: false
 
 gem "bcrypt", "~> 3.1.6"
 
@@ -204,7 +204,7 @@ gem "plaintext", "~> 0.3.2"
 
 gem "ruby-progressbar", "~> 1.13.0", require: false
 
-gem "mini_magick", "~> 4.12.0", require: false
+gem "mini_magick", "~> 4.13.0", require: false
 
 gem "validate_url"
 

Gemfile.lock

@@ -81,7 +81,7 @@ PATH
   remote: modules/backlogs
   specs:
     openproject-backlogs (1.0.0)
-      acts_as_list (~> 1.1.0)
+      acts_as_list (~> 1.2.0)
 
 PATH
   remote: modules/bim
@@ -206,7 +206,7 @@ PATH
   remote: modules/two_factor_authentication
   specs:
     openproject-two_factor_authentication (1.0.0)
-      aws-sdk-sns (~> 1.75.0)
+      aws-sdk-sns (~> 1.77.0)
       messagebird-rest (~> 1.4.2)
       rotp (~> 6.1)
       webauthn (~> 3.0)
@@ -318,8 +318,9 @@ GEM
       minitest (>= 5.1)
       mutex_m
       tzinfo (~> 2.0)
-    acts_as_list (1.1.0)
-      activerecord (>= 4.2)
+    acts_as_list (1.2.1)
+      activerecord (>= 6.1)
+      activesupport (>= 6.1)
     acts_as_tree (2.9.1)
       activerecord (>= 3.0.0)
     addressable (2.8.6)
@@ -341,21 +342,21 @@ GEM
       activerecord (>= 4.0.0, < 7.2)
     awrence (1.2.1)
     aws-eventstream (1.3.0)
-    aws-partitions (1.944.0)
-    aws-sdk-core (3.197.0)
+    aws-partitions (1.945.0)
+    aws-sdk-core (3.197.1)
       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.84.0)
+    aws-sdk-kms (1.85.0)
       aws-sdk-core (~> 3, >= 3.197.0)
       aws-sigv4 (~> 1.1)
     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)
-      aws-sdk-core (~> 3, >= 3.193.0)
+    aws-sdk-sns (1.77.0)
+      aws-sdk-core (~> 3, >= 3.197.0)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
@@ -424,7 +425,7 @@ GEM
       rb_sys (~> 0.9)
     compare-xml (0.66)
       nokogiri (~> 1.8)
-    concurrent-ruby (1.3.1)
+    concurrent-ruby (1.3.3)
     connection_pool (2.4.1)
     cookiejar (0.3.4)
     cose (1.3.0)
@@ -505,7 +506,7 @@ GEM
       rubocop
       smart_properties
     erblint-github (1.0.1)
-    erubi (1.12.0)
+    erubi (1.13.0)
     escape_utils (1.3.0)
     et-orbi (1.2.11)
       tzinfo
@@ -517,7 +518,7 @@ GEM
     factory_bot_rails (6.4.3)
       factory_bot (~> 6.4)
       railties (>= 5.0.0)
-    faraday (2.9.0)
+    faraday (2.9.2)
       faraday-net_http (>= 2.0, < 3.2)
     faraday-follow_redirects (0.3.0)
       faraday (>= 1, < 3)
@@ -638,7 +639,7 @@ GEM
     ice_nine (0.11.2)
     interception (0.5)
     io-console (0.7.2)
-    irb (1.13.1)
+    irb (1.13.2)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     iso8601 (0.13.0)
@@ -653,24 +654,23 @@ GEM
       faraday-follow_redirects
     json-schema (4.3.0)
       addressable (>= 2.8)
-    json_schemer (2.2.1)
-      base64
+    json_schemer (2.3.0)
       bigdecimal
       hana (~> 1.3)
       regexp_parser (~> 2.0)
       simpleidn (~> 0.2)
     json_spec (1.1.5)
       multi_json (~> 1.0)
       rspec (>= 2.0, < 4.0)
-    jwt (2.8.1)
+    jwt (2.8.2)
       base64
     ladle (1.0.1)
       open4 (~> 1.0)
     language_server-protocol (3.17.0.3)
     launchy (3.0.1)
       addressable (~> 2.8)
       childprocess (~> 5.0)
-    lefthook (1.6.16)
+    lefthook (1.6.17)
     letter_opener (1.10.0)
       launchy (>= 2.2, < 4)
     letter_opener_web (3.0.0)
@@ -720,10 +720,10 @@ GEM
     mime-types (3.5.2)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2024.0604)
-    mini_magick (4.12.0)
+    mini_magick (4.13.1)
     mini_mime (1.1.5)
     mini_portile2 (2.8.7)
-    minitest (5.23.1)
+    minitest (5.24.0)
     msgpack (1.7.2)
     multi_json (1.15.0)
     mustermann (3.0.0)
@@ -733,7 +733,7 @@ GEM
     mutex_m (0.2.0)
     net-http (0.4.1)
       uri
-    net-imap (0.4.12)
+    net-imap (0.4.13)
       date
       net-protocol
     net-ldap (0.19.0)
@@ -821,8 +821,8 @@ GEM
     pry-doc (1.5.0)
       pry (~> 0.11)
       yard (~> 0.9.11)
-    pry-rails (0.3.9)
-      pry (>= 0.10.4)
+    pry-rails (0.3.11)
+      pry (>= 0.13.0)
     pry-rescue (1.6.0)
       interception (>= 0.5)
       pry (>= 0.12.0)
@@ -925,7 +925,7 @@ GEM
     redis-client (0.22.2)
       connection_pool
     regexp_parser (2.9.2)
-    reline (0.5.8)
+    reline (0.5.9)
       io-console (~> 0.5)
     representable (3.2.0)
       declarative (< 0.1.0)
@@ -943,20 +943,20 @@ GEM
     roar (1.2.0)
       representable (~> 3.1)
     rotp (6.3.0)
-    rouge (4.2.1)
+    rouge (4.3.0)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
     rspec-core (3.13.0)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.0)
+    rspec-expectations (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (6.1.2)
+    rspec-rails (6.1.3)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       railties (>= 6.1)
@@ -1057,7 +1057,7 @@ GEM
     store_attribute (1.2.0)
       activerecord (>= 6.0)
     stringex (2.8.6)
-    stringio (3.1.0)
+    stringio (3.1.1)
     strscan (3.1.0)
     structured_warnings (0.4.0)
     svg-graph (2.2.2)
@@ -1066,7 +1066,7 @@ GEM
       attr_required (>= 0.0.5)
       faraday (~> 2.0)
       faraday-follow_redirects
-    sys-filesystem (1.4.5)
+    sys-filesystem (1.5.0)
       ffi (~> 1.1)
     table_print (1.5.7)
     terminal-table (3.0.2)
@@ -1144,7 +1144,7 @@ GEM
     xpath (3.2.0)
       nokogiri (~> 1.8)
     yard (0.9.36)
-    zeitwerk (2.6.15)
+    zeitwerk (2.6.16)
 
 PLATFORMS
   ruby
@@ -1155,7 +1155,7 @@ DEPENDENCIES
   activerecord-import (~> 1.7.0)
   activerecord-nulldb-adapter (~> 1.0.0)
   activerecord-session_store (~> 2.1.0)
-  acts_as_list (~> 1.1.0)
+  acts_as_list (~> 1.2.0)
   acts_as_tree (~> 2.9.0)
   addressable (~> 2.8.0)
   airbrake (~> 13.0.0)
@@ -1217,7 +1217,7 @@ DEPENDENCIES
   httpx
   i18n-js (~> 4.2.3)
   i18n-tasks (~> 1.0.13)
-  json_schemer (~> 2.2.0)
+  json_schemer (~> 2.3.0)
   json_spec (~> 1.1.4)
   ladle
   launchy (~> 3.0.0)
@@ -1231,7 +1231,7 @@ DEPENDENCIES
   matrix (~> 0.4.2)
   md_to_pdf!
   meta-tags (~> 2.21.0)
-  mini_magick (~> 4.12.0)
+  mini_magick (~> 4.13.0)
   multi_json (~> 1.15.0)
   my_page!
   net-ldap (~> 0.19.0)
@@ -1301,7 +1301,7 @@ DEPENDENCIES
   retriable (~> 3.1.1)
   rinku (~> 2.0.4)
   roar (~> 1.2.0)
-  rouge (~> 4.2.0)
+  rouge (~> 4.3.0)
   rspec (~> 3.13.0)
   rspec-rails (~> 6.1.0)
   rspec-retry (~> 0.6.1)
@@ -1333,7 +1333,7 @@ DEPENDENCIES
   stringex (~> 2.8.5)
   structured_warnings (~> 0.4.0)
   svg-graph (~> 2.2.0)
-  sys-filesystem (~> 1.4.0)
+  sys-filesystem (~> 1.5.0)
   table_print (~> 1.5.6)
   test-prof (~> 1.3.0)
   timecop (~> 0.9.0)
@@ -1352,7 +1352,7 @@ DEPENDENCIES
   with_advisory_lock (~> 5.1.0)
 
 RUBY VERSION
-   ruby 3.3.2p78
+   ruby 3.3.3p89
 
 BUNDLED WITH
-   2.5.11
+   2.5.13

app/contracts/base_contract.rb

@@ -237,7 +237,7 @@ def collect_available_custom_field_attributes
       # as the disabled custom fields would be treated as not-writable
       #
       # relevant especially for the project API
-      model.available_custom_fields(global: true).map(&:attribute_name)
+      model.all_available_custom_fields.map(&:attribute_name)
     else
       model.available_custom_fields.map(&:attribute_name)
     end

app/models/activities/base_activity_provider.rb

@@ -219,7 +219,7 @@ def restrict_projects_query(user, options)
 
   def restrict_projects_by_selection(options, query)
     if (project = options[:project])
-      query = query.where(project.project_condition(options[:with_subprojects]))
+      query = query.where(project.with_subprojects(options[:with_subprojects]))
     end
 
     query