Merge branch 'dev' into implementation/48114-create-meetings-outside-…

…of-a-project

.github/workflows/pullpreview.yml

@@ -44,11 +44,11 @@ jobs:
     - uses: pullpreview/action@v5
       with:
         admins: crohr,HDinger,machisuji,oliverguenther,ulferts,wielinde,b12f,cbliard
-        always_on: dev
         compose_files: docker-compose.pullpreview.yml
-        instance_type: large_2_0
+        instance_type: large
         ports: 80,443,8080
         default_port: 443
+        ttl: 10d
       env:
         AWS_ACCESS_KEY_ID: "${{ secrets.AWS_ACCESS_KEY_ID }}"
         AWS_SECRET_ACCESS_KEY: "${{ secrets.AWS_SECRET_ACCESS_KEY }}"

.redocly.lint-ignore.yaml

@@ -6,6 +6,7 @@ tmp/oas-generated.yml:
     - '#/paths/~1api~1v3~1file_links~1{file_link_id}~1open/get/responses'
   operation-4xx-response:
     - '#/paths/~1api~1v3/get/responses'
+    - '#/paths/~1api~1v3~1help_texts/get/responses'
   no-ambiguous-paths:
     - '#/paths/~1api~1v3~1queries~1{id}~1form'
     - '#/paths/~1api~1v3~1queries~1{id}~1star'

Gemfile

@@ -156,7 +156,7 @@ gem 'structured_warnings', '~> 0.4.0'
 gem 'airbrake', '~> 13.0.0', require: false
 
 gem 'prawn', '~> 2.2'
-gem 'md_to_pdf', git: 'https://github.com/opf/md-to-pdf', tag: 'v0.0.18'
+gem 'md_to_pdf', git: 'https://github.com/opf/md-to-pdf', ref: '4c42148220ecaa8363134f34331ce90277e1b380'
 # prawn implicitly depends on matrix gem no longer in ruby core with 3.1
 gem 'matrix', '~> 0.4.2'
 
@@ -202,6 +202,9 @@ gem 'mini_magick', '~> 4.12.0', require: false
 
 gem 'validate_url'
 
+# ActiveRecord extension which adds typecasting to store accessors
+gem "store_attribute", "~> 1.0"
+
 # Appsignal integration
 gem "appsignal", "~> 3.0", require: false
 
@@ -228,9 +231,6 @@ group :test do
   gem 'retriable', '~> 3.1.1'
   gem 'rspec-retry', '~> 0.6.1'
 
-  # Wait for conditions in RSpec
-  gem 'rspec-wait'
-
   # Modify ENV
   gem 'climate_control'
 

Gemfile.lock

@@ -10,10 +10,10 @@ GIT
 
 GIT
   remote: https://github.com/opf/md-to-pdf
-  revision: 10bbfbd6f4afdb36918ed9ea686c818144683738
-  tag: v0.0.18
+  revision: 4c42148220ecaa8363134f34331ce90277e1b380
+  ref: 4c42148220ecaa8363134f34331ce90277e1b380
   specs:
-    md_to_pdf (0.0.18)
+    md_to_pdf (0.0.19)
       commonmarker (~> 0.23)
       front_matter_parser (~> 1.0)
       json-schema (~> 4.0)
@@ -74,7 +74,6 @@ PATH
   specs:
     openproject-backlogs (1.0.0)
       acts_as_list (~> 1.1.0)
-      openproject-pdf_export
 
 PATH
   remote: modules/bim
@@ -162,13 +161,6 @@ PATH
     overviews (1.0.0)
       grids
 
-PATH
-  remote: modules/pdf_export
-  specs:
-    openproject-pdf_export (1.0.0)
-      pdf-inspector (~> 1.3.0)
-      prawn (~> 2.2)
-
 PATH
   remote: modules/recaptcha
   specs:
@@ -195,7 +187,7 @@ PATH
   remote: modules/two_factor_authentication
   specs:
     openproject-two_factor_authentication (1.0.0)
-      aws-sdk-sns (~> 1.61.0)
+      aws-sdk-sns (~> 1.65.0)
       messagebird-rest (~> 1.4.2)
       rotp (~> 6.1)
 
@@ -213,7 +205,6 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    Ascii85 (1.1.0)
     actioncable (7.0.6)
       actionpack (= 7.0.6)
       activesupport (= 7.0.6)
@@ -303,7 +294,6 @@ GEM
     addressable (2.8.4)
       public_suffix (>= 2.0.2, < 6.0)
     aes_key_wrap (1.1.0)
-    afm (0.2.2)
     airbrake (13.0.3)
       airbrake-ruby (~> 6.0)
     airbrake-ruby (6.2.1)
@@ -317,21 +307,21 @@ GEM
     awesome_nested_set (3.5.0)
       activerecord (>= 4.0.0, < 7.1)
     aws-eventstream (1.2.0)
-    aws-partitions (1.784.0)
-    aws-sdk-core (3.177.0)
+    aws-partitions (1.786.0)
+    aws-sdk-core (3.178.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.5)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.70.0)
+    aws-sdk-kms (1.71.0)
       aws-sdk-core (~> 3, >= 3.177.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.128.0)
+    aws-sdk-s3 (1.130.0)
       aws-sdk-core (~> 3, >= 3.177.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.6)
-    aws-sdk-sns (1.61.0)
-      aws-sdk-core (~> 3, >= 3.174.0)
+    aws-sdk-sns (1.65.0)
+      aws-sdk-core (~> 3, >= 3.177.0)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.6.0)
       aws-eventstream (~> 1, >= 1.0.2)
@@ -445,13 +435,13 @@ GEM
       tzinfo
     eventmachine (1.2.7)
     eventmachine_httpserver (0.2.1)
-    excon (0.99.0)
+    excon (0.100.0)
     factory_bot (6.2.1)
       activesupport (>= 5.0.0)
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
-    faraday (2.7.9)
+    faraday (2.7.10)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-follow_redirects (0.3.0)
@@ -528,7 +518,6 @@ GEM
     gravatar_image_tag (1.2.0)
     hana (1.3.7)
     hashdiff (1.0.1)
-    hashery (2.1.2)
     hashie (3.6.0)
     html-pipeline (2.14.3)
       activesupport (>= 2)
@@ -548,8 +537,8 @@ GEM
     ice_cube (0.16.4)
     interception (0.5)
     io-console (0.6.0)
-    irb (1.7.0)
-      reline (>= 0.3.0)
+    irb (1.7.4)
+      reline (>= 0.3.6)
     iso8601 (0.13.0)
     jmespath (1.6.2)
     json (2.6.3)
@@ -574,7 +563,7 @@ GEM
     language_server-protocol (3.17.0.3)
     launchy (2.5.2)
       addressable (~> 2.8)
-    lefthook (1.4.3)
+    lefthook (1.4.5)
     letter_opener (1.8.1)
       launchy (>= 2.2, < 3)
     listen (3.8.0)
@@ -661,7 +650,7 @@ GEM
     openproject-token (3.0.1)
       activemodel
     os (1.1.4)
-    ox (2.14.16)
+    ox (2.14.17)
     paper_trail (12.3.0)
       activerecord (>= 5.2)
       request_store (~> 1.1)
@@ -672,14 +661,6 @@ GEM
       ast (~> 2.4.1)
       racc
     pdf-core (0.9.0)
-    pdf-inspector (1.3.0)
-      pdf-reader (>= 1.0, < 3.0.a)
-    pdf-reader (2.11.0)
-      Ascii85 (~> 1.0)
-      afm (~> 0.2.1)
-      hashery (~> 2.0)
-      ruby-rc4
-      ttfunk
     pg (1.5.3)
     plaintext (0.3.4)
       activesupport (> 2.2.1)
@@ -704,7 +685,7 @@ GEM
       pry (>= 0.12.0)
     psych (5.1.0)
       stringio
-    public_suffix (5.0.1)
+    public_suffix (5.0.3)
     puffing-billy (3.1.0)
       addressable (~> 2.5)
       em-http-request (~> 1.1, >= 1.1.0)
@@ -761,8 +742,9 @@ GEM
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
       activesupport (>= 5.0.1.rc1)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
+    rails-dom-testing (2.1.1)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
@@ -788,7 +770,7 @@ GEM
     recaptcha (5.14.0)
     redcarpet (3.6.0)
     regexp_parser (2.8.1)
-    reline (0.3.5)
+    reline (0.3.6)
       io-console (~> 0.5)
     representable (3.2.0)
       declarative (< 0.1.0)
@@ -820,7 +802,7 @@ GEM
     rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.5)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-rails (6.0.3)
@@ -833,10 +815,8 @@ GEM
       rspec-support (~> 3.12)
     rspec-retry (0.6.2)
       rspec-core (> 3.3)
-    rspec-support (3.12.0)
-    rspec-wait (0.0.9)
-      rspec (>= 3, < 4)
-    rubocop (1.54.1)
+    rspec-support (3.12.1)
+    rubocop (1.54.2)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -868,7 +848,6 @@ GEM
     ruby-ole (1.2.12.2)
     ruby-prof (1.6.3)
     ruby-progressbar (1.13.0)
-    ruby-rc4 (0.1.5)
     ruby-saml (1.15.0)
       nokogiri (>= 1.13.10)
       rexml
@@ -917,6 +896,8 @@ GEM
       sprockets (>= 3.0.0)
     ssrf_filter (1.1.1)
     stackprof (0.2.25)
+    store_attribute (1.1.1)
+      activerecord (>= 6.0)
     stringex (2.8.6)
     stringio (3.0.7)
     structured_warnings (0.4.0)
@@ -932,7 +913,7 @@ GEM
     test-prof (1.2.2)
     text-hyphen (1.5.0)
     thor (1.2.2)
-    tilt (2.1.0)
+    tilt (2.2.0)
     timecop (0.9.6)
     timeout (0.4.0)
     trailblazer-option (0.1.2)
@@ -958,7 +939,7 @@ GEM
     validate_url (1.0.15)
       activemodel (>= 3.0.0)
       public_suffix
-    view_component (3.3.0)
+    view_component (3.4.0)
       activesupport (>= 5.2.0, < 8.0)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)
@@ -1091,7 +1072,6 @@ DEPENDENCIES
   openproject-ldap_groups!
   openproject-meeting!
   openproject-openid_connect!
-  openproject-pdf_export!
   openproject-recaptcha!
   openproject-reporting!
   openproject-storages!
@@ -1135,7 +1115,6 @@ DEPENDENCIES
   rspec (~> 3.12.0)
   rspec-rails (~> 6.0.0)
   rspec-retry (~> 0.6.1)
-  rspec-wait
   rubocop
   rubocop-rails
   rubocop-rspec
@@ -1155,6 +1134,7 @@ DEPENDENCIES
   sprockets (~> 3.7.2)
   sprockets-rails (~> 3.4.2)
   stackprof
+  store_attribute (~> 1.0)
   stringex (~> 2.8.5)
   structured_warnings (~> 0.4.0)
   svg-graph (~> 2.2.0)

Gemfile.modules

@@ -28,7 +28,6 @@ group :opf_plugins do
   gem 'costs',                                 path: 'modules/costs'
   gem 'openproject-reporting',                 path: 'modules/reporting'
   gem 'openproject-meeting',                   path: 'modules/meeting'
-  gem 'openproject-pdf_export',                path: 'modules/pdf_export'
   gem "openproject-backlogs",                  path: 'modules/backlogs'
   gem 'openproject-avatars',                   path: 'modules/avatars'
   gem 'openproject-two_factor_authentication', path: 'modules/two_factor_authentication'

app/components/attribute_groups/attribute_group_component.html.erb

@@ -30,9 +30,11 @@ See COPYRIGHT and LICENSE files for more details.
 <div class="attributes-group">
   <%= header %>
 
-  <div class="attributes-key-value">
+  <div class="attributes-group--attributes">
     <% attributes.each do |attribute| %>
-      <%= attribute %>
+      <div class="attributes-key-value">
+        <%= attribute %>
+      </div>
     <% end %>
   </div>
 

app/components/attribute_groups/attribute_key_value_component.html.erb

@@ -30,6 +30,10 @@ See COPYRIGHT and LICENSE files for more details.
 <div class="attributes-key-value--key"><%= key %></div>
 <div class="attributes-key-value--value-container">
   <div class="attributes-key-value--value -text">
-    <span><%= value %></span>
+    <% if value %>
+      <span><%= value %></span>
+    <% end %>
+
+    <%= content %>
   </div>
 </div>

app/controllers/account_controller.rb

@@ -41,7 +41,6 @@ class AccountController < ApplicationController
   before_action :disable_api
   before_action :check_auth_source_sso_failure, only: :auth_source_sso_failed
   before_action :check_internal_login_enabled, only: :internal_login
-  after_action :remove_internal_login_flag, only: :login
 
   layout 'no_menu'
 
@@ -51,16 +50,15 @@ def login
 
     if user.logged?
       redirect_after_login(user)
-    elsif omniauth_direct_login? && !session[:internal_login]
+    elsif request.get? && omniauth_direct_login?
       direct_login(user)
     elsif request.post?
       authenticate_user
     end
   end
 
   def internal_login
-    session[:internal_login] = true
-    redirect_to action: :login
+    render 'account/login'
   end
 
   # Log out current user and redirect to welcome page
@@ -538,8 +536,4 @@ def apply_csp_appends
   def check_internal_login_enabled
     render_404 unless omniauth_direct_login?
   end
-
-  def remove_internal_login_flag
-    session.delete :internal_login
-  end
 end

app/controllers/activities_controller.rb

@@ -105,7 +105,7 @@ def determine_author
   end
 
   def respond_html
-    render locals: { menu_name: project_or_global_activity_menu }
+    render locals: { menu_name: project_or_global_menu }
   end
 
   def respond_atom