[pull] dev from opf:dev

.dockerignore

@@ -33,6 +33,5 @@ frontend/node_modules
 node_modules
 # travis
 vendor/bundle
-# allow precompiled assets to be injected
-!/public/assets
-!/config/frontend_assets.manifest.json
+/public/assets
+/config/frontend_assets.manifest.json

.github/workflows/docker.yml

@@ -83,6 +83,7 @@ jobs:
       - name: Precompile assets
         run: |
           ./docker/prod/setup/precompile-assets.sh
+          # public/assets will be saved as artifact, so temporarily copying config file there as well
           cp config/frontend_assets.manifest.json public/assets/frontend_assets.manifest.json
       - uses: actions/upload-artifact@v3
         with:
@@ -142,6 +143,10 @@ jobs:
           ls -al public/
           mv public/assets/frontend_assets.manifest.json config/frontend_assets.manifest.json
           ls -al config/frontend_assets.manifest.json
+          # allow precompiled assets to be injected into docker image
+          echo '' >> .dockerignore
+          echo '!/public/assets' >> .dockerignore
+          echo '!/config/frontend_assets.manifest.json' >> .dockerignore
       - name: Add build information
         run: |
           echo "${{ needs.setup.outputs.checkout_ref }}" > PRODUCT_VERSION

.github/workflows/rubocop-core.yml

@@ -2,24 +2,26 @@ name: rubocop
 
 on:
   pull_request:
-    branches:
-      - dev
-      - release/*
-    paths:
-      - '**.rb'
 
 jobs:
   rubocop:
     name: rubocop
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
+      - name: Fetch all commits for PR branch plus head commit of base branch
+        run: |
+          # fetch all commits of the PR branch
+          git fetch --shallow-exclude "${{ github.base_ref }}" origin "${{ github.ref }}"
+          # fix for "fatal: error in object: unshallow"
+          git repack -d
+          # fetch head commit of base branch
+          git fetch --deepen 1 origin "${{ github.ref }}"
       - uses: ruby/setup-ruby@v1
-      - uses: opf/action-rubocop@v2
+      - uses: opf/action-rubocop@master
         with:
           github_token: ${{ secrets.github_token }}
           rubocop_version: gemfile
-          rubocop_extensions: rubocop-rails:gemfile rubocop-rspec:gemfile
+          rubocop_extensions: rubocop-inflector:gemfile rubocop-performance:gemfile rubocop-rails:gemfile rubocop-rspec:gemfile
           reporter: github-pr-check
+          only_changed: true

.github/workflows/test-core.yml

@@ -44,9 +44,9 @@ jobs:
       uses: runs-on/cache@v4
       with:
         path: cache/bundle
-        key: gem-${{ hashFiles('.ruby-version') }}-${{ hashFiles('Gemfile.lock') }}
+        key: gem-bookworm-${{ hashFiles('.ruby-version') }}-${{ hashFiles('Gemfile.lock') }}
         restore-keys: |
-          gem-${{ hashFiles('.ruby-version') }}-
+          gem-bookworm-${{ hashFiles('.ruby-version') }}-
     - name: Cache NPM
       uses: runs-on/cache@v4
       with:

Gemfile

@@ -159,6 +159,7 @@ gem "airbrake", "~> 13.0.0", require: false
 
 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"
 
@@ -383,6 +384,6 @@ gemfiles.each do |file|
   send(:eval_gemfile, file) if File.readable?(file)
 end
 
-gem "openproject-octicons", "~>19.10.0"
-gem "openproject-octicons_helper", "~>19.10.0"
-gem "openproject-primer_view_components", "~>0.29.1"
+gem "openproject-octicons", "~>19.12.0"
+gem "openproject-octicons_helper", "~>19.12.0"
+gem "openproject-primer_view_components", "~>0.30.1"

Gemfile.lock

@@ -331,7 +331,7 @@ GEM
     airbrake-ruby (6.2.2)
       rbtree3 (~> 0.6)
     android_key_attestation (0.3.0)
-    appsignal (3.7.4)
+    appsignal (3.7.5)
       rack
     ast (2.4.2)
     attr_required (1.0.2)
@@ -341,16 +341,16 @@ GEM
       activerecord (>= 4.0.0, < 7.2)
     awrence (1.2.1)
     aws-eventstream (1.3.0)
-    aws-partitions (1.925.0)
-    aws-sdk-core (3.194.2)
+    aws-partitions (1.929.0)
+    aws-sdk-core (3.196.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.80.0)
+    aws-sdk-kms (1.81.0)
       aws-sdk-core (~> 3, >= 3.193.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.149.1)
+    aws-sdk-s3 (1.151.0)
       aws-sdk-core (~> 3, >= 3.194.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.8)
@@ -359,11 +359,11 @@ GEM
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.8.0)
       aws-eventstream (~> 1, >= 1.0.2)
-    axe-core-api (4.9.0)
+    axe-core-api (4.9.1)
       dumb_delegator
       virtus
-    axe-core-rspec (4.9.0)
-      axe-core-api
+    axe-core-rspec (4.9.1)
+      axe-core-api (= 4.9.1)
       dumb_delegator
       virtus
     axiom-types (0.1.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.4)
+    httpx (1.2.5)
       http-2-next (>= 1.0.3)
     i18n (1.14.5)
       concurrent-ruby (~> 1.0)
@@ -670,13 +670,13 @@ GEM
     launchy (3.0.1)
       addressable (~> 2.8)
       childprocess (~> 5.0)
-    lefthook (1.6.10)
+    lefthook (1.6.11)
     letter_opener (1.10.0)
       launchy (>= 2.2, < 4)
-    letter_opener_web (2.0.0)
-      actionmailer (>= 5.2)
-      letter_opener (~> 1.7)
-      railties (>= 5.2)
+    letter_opener_web (3.0.0)
+      actionmailer (>= 6.1)
+      letter_opener (~> 1.9)
+      railties (>= 6.1)
       rexml
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
@@ -723,7 +723,7 @@ GEM
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.6)
-    minitest (5.22.3)
+    minitest (5.23.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.10)
+    net-imap (0.4.11)
       date
       net-protocol
     net-ldap (0.19.0)
@@ -744,7 +744,7 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.1)
-    nokogiri (1.16.4)
+    nokogiri (1.16.5)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oj (3.16.3)
@@ -767,15 +767,15 @@ GEM
       validate_email
       validate_url
       webfinger (~> 2.0)
-    openproject-octicons (19.10.0)
-    openproject-octicons_helper (19.10.0)
+    openproject-octicons (19.12.0)
+    openproject-octicons_helper (19.12.0)
       actionview
-      openproject-octicons (= 19.10.0)
+      openproject-octicons (= 19.12.0)
       railties
-    openproject-primer_view_components (0.29.1)
+    openproject-primer_view_components (0.30.1)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
-      openproject-octicons (>= 19.9.0)
+      openproject-octicons (>= 19.12.0)
       view_component (>= 3.1, < 4.0)
     openproject-token (4.0.0)
       activemodel
@@ -793,7 +793,7 @@ GEM
     parser (3.3.1.0)
       ast (~> 2.4.1)
       racc
-    pdf-core (0.10.0)
+    pdf-core (0.9.0)
     pdf-inspector (1.3.0)
       pdf-reader (>= 1.0, < 3.0.a)
     pdf-reader (2.12.0)
@@ -807,10 +807,9 @@ GEM
       activesupport (> 2.2.1)
       nokogiri (~> 1.10, >= 1.10.4)
       rubyzip (>= 1.2.0)
-    prawn (2.5.0)
-      matrix (~> 0.4)
-      pdf-core (~> 0.10.0)
-      ttfunk (~> 1.8)
+    prawn (2.4.0)
+      pdf-core (~> 0.9.0)
+      ttfunk (~> 1.7)
     prawn-table (0.2.2)
       prawn (>= 1.3.0, < 3.0.0)
     pry (0.14.2)
@@ -926,7 +925,7 @@ GEM
     redis-client (0.22.1)
       connection_pool
     regexp_parser (2.9.0)
-    reline (0.5.6)
+    reline (0.5.7)
       io-console (~> 0.5)
     representable (3.2.0)
       declarative (< 0.1.0)
@@ -938,7 +937,8 @@ GEM
       actionpack (>= 5.2)
       railties (>= 5.2)
     retriable (3.1.2)
-    rexml (3.2.6)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
     rinku (2.0.6)
     roar (1.2.0)
       representable (~> 3.1)
@@ -1065,6 +1065,7 @@ GEM
       activerecord (>= 6.0)
     stringex (2.8.6)
     stringio (3.1.0)
+    strscan (3.1.0)
     structured_warnings (0.4.0)
     svg-graph (2.2.2)
     swd (2.0.3)
@@ -1088,8 +1089,7 @@ GEM
       openssl (> 2.0)
       openssl-signature_algorithm (~> 1.0)
     trailblazer-option (0.1.2)
-    ttfunk (1.8.0)
-      bigdecimal (~> 3.1)
+    ttfunk (1.7.0)
     turbo-rails (2.0.5)
       actionpack (>= 6.0.0)
       activejob (>= 6.0.0)
@@ -1154,7 +1154,7 @@ GEM
     xpath (3.2.0)
       nokogiri (~> 1.8)
     yard (0.9.36)
-    zeitwerk (2.6.13)
+    zeitwerk (2.6.14)
 
 PLATFORMS
   ruby
@@ -1266,10 +1266,10 @@ DEPENDENCIES
   openproject-job_status!
   openproject-ldap_groups!
   openproject-meeting!
-  openproject-octicons (~> 19.10.0)
-  openproject-octicons_helper (~> 19.10.0)
+  openproject-octicons (~> 19.12.0)
+  openproject-octicons_helper (~> 19.12.0)
   openproject-openid_connect!
-  openproject-primer_view_components (~> 0.29.1)
+  openproject-primer_view_components (~> 0.30.1)
   openproject-recaptcha!
   openproject-reporting!
   openproject-storages!
@@ -1344,6 +1344,7 @@ DEPENDENCIES
   table_print (~> 1.5.6)
   test-prof (~> 1.3.0)
   timecop (~> 0.9.0)
+  ttfunk (~> 1.7.0)
   turbo-rails (~> 2.0.0)
   turbo_tests!
   typed_dag (~> 2.0.2)

app/components/projects/configure_view_modal_component.html.erb

@@ -4,7 +4,7 @@
                                      # Hack to give the draggable autcompleter (ng-select) bound to the dialog
                                      # enough height to display all options.
                                      # This is necessary as long as ng-select does not support popovers.
-                                     style: "min-height: 430px")) do |d| %>
+                                     style: "min-height: 480px")) do |d| %>
   <% d.with_header(variant: :large, mb: 3) %>
   <%= render(Primer::Alpha::Dialog::Body.new) do %>
     <%= primer_form_with(
@@ -20,20 +20,18 @@
         <% tab_panel.with_tab(selected: true, id: "tab-selects") do |tab| %>
           <% tab.with_text { I18n.t("label_columns") } %>
           <% tab.with_panel do %>
-            <div id="op-draggable-autocomplete-container">
-              <%= helpers.angular_component_tag 'opce-draggable-autocompleter',
-                                            inputs: {
-                                              options: helpers.projects_columns_options,
-                                              selected: selected_columns,
-                                              protected: helpers.protected_projects_columns_options,
-                                              name: COLUMN_HTML_NAME,
-                                              id: 'columns-select',
-                                              inputLabel: I18n.t(:'queries.configure_view.columns.input_label'),
-                                              inputPlaceholder: I18n.t(:'queries.configure_view.columns.input_placeholder'),
-                                              dragAreaLabel: I18n.t(:'queries.configure_view.columns.drag_area_label'),
-                                              appendToComponent: true
-                                            }%>
-            </div>
+            <%= helpers.angular_component_tag 'opce-draggable-autocompleter',
+                                          inputs: {
+                                            options: helpers.projects_columns_options,
+                                            selected: selected_columns,
+                                            protected: helpers.protected_projects_columns_options,
+                                            name: COLUMN_HTML_NAME,
+                                            id: 'columns-select',
+                                            inputLabel: I18n.t(:'queries.configure_view.columns.input_label'),
+                                            inputPlaceholder: I18n.t(:'queries.configure_view.columns.input_placeholder'),
+                                            dragAreaLabel: I18n.t(:'queries.configure_view.columns.drag_area_label'),
+                                            appendToComponent: true
+                                          }%>
           <% end %>
         <% end %>
         <% tab_panel.with_tab(id: "tab-selects") do |tab| %>

app/components/queries/sort_by_field_component.html.erb

@@ -1,8 +1,8 @@
-<%= render(Primer::OpenProject::FlexLayout.new) do |flex| %>
+<%= render(Primer::OpenProject::FlexLayout.new(test_selector: 'sort-by-field' })) do |flex| %>
   <% flex.with_column(flex: 1) do %>
     <%#- We are just using the classes of the primer component here, because when using the primer component, we cannot detach the input element from the form %>
     <%#- The form="none" adds the input to a nonexistant form (as we do not have one with the ID="none" and thus the fields to not get appended to the query string %>
-    <%= select_tag 'sort_field', select_options, include_blank: true, form: "none", class: "FormControl-select FormControl-medium FormControl--fullWidth", data: { action: "change->sort-by-config#fieldChanged"} %>
+    <%= select_tag 'sort_field', select_options, prompt: "-", form: "none", class: "FormControl-select FormControl-medium FormControl--fullWidth", data: { action: "change->sort-by-config#fieldChanged"} %>
   <% end %>
   <% flex.with_column do %>
     <%= render(Primer::Alpha::SegmentedControl.new("aria-label": "Sort order", hide_labels: true, ml: 3)) do |sort_buttons| %>

app/controllers/concerns/member_helper.rb

@@ -59,7 +59,7 @@ def user_ids_for_new_members(member_params)
 
   def invite_new_users(user_ids, send_notification: true)
     user_ids.filter_map do |id|
-      if id.to_i == 0 && id.present? # we've got an email - invite that user
+      if id.present? && (id.to_i == 0 || EmailValidator.valid?(id)) # we've got an email - invite that user
         # Only users with the create_user permission can add users.
         if current_user.allowed_globally?(:create_user) && enterprise_allow_new_users?
           # The invitation can pretty much only fail due to the user already

app/controllers/work_packages_controller.rb

@@ -37,6 +37,7 @@ class WorkPackagesController < ApplicationController
   before_action :authorize_on_work_package,
                 :project, only: :show
   before_action :find_optional_project,
+                :check_allowed_export,
                 :protect_from_unauthorized_export, only: :index
 
   before_action :load_and_validate_query, only: :index, unless: -> { request.format.html? }

app/helpers/roles_helper.rb

@@ -44,4 +44,13 @@ def group_permissions_by_module(perms)
     perms.group_by { |p| p.project_module.to_s }
          .slice(*enabled_module_names)
   end
+
+  def permission_header_for_project_module(mod)
+    if mod.blank?
+      Project.model_name.human
+    else
+      I18n.t("permission_header_for_project_module_#{mod}",
+             default: [:"project_module_#{mod}", mod.humanize])
+    end
+  end
 end