Merge branch 'dev' into feature/40749-consistent-calculation-of-perce…

…nt-complete

.github/workflows/continuous-delivery.yml

@@ -4,6 +4,7 @@ on:
     branches:
       - dev
       - release/*
+      - stable/*
 permissions:
   contents: read
 

Gemfile

@@ -124,8 +124,7 @@ gem 'multi_json', '~> 1.15.0'
 gem 'oj', '~> 3.16.0'
 
 gem 'daemons'
-gem 'delayed_cron_job', '~> 0.9.0'
-gem 'delayed_job_active_record', '~> 4.1.5'
+gem 'good_job', '~> 3.26.1' # update should be done manually in sync with saas-openproject version.
 
 gem 'rack-protection', '~> 3.2.0'
 

Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/citizensadvice/capybara_accessible_selectors
-  revision: 0c78a39ec6b8895858612896cc5695dcee0e6159
+  revision: f9a7261a3c44cead8b40cbc4353c242a2b0ca388
   branch: main
   specs:
     capybara_accessible_selectors (0.11.0)
@@ -141,6 +141,12 @@ PATH
     openproject-github_integration (1.0.0)
       openproject-webhooks
 
+PATH
+  remote: modules/gitlab_integration
+  specs:
+    openproject-gitlab_integration (3.0.0)
+      openproject-webhooks
+
 PATH
   remote: modules/grids
   specs:
@@ -211,6 +217,7 @@ PATH
       aws-sdk-sns (~> 1.72.0)
       messagebird-rest (~> 1.4.2)
       rotp (~> 6.1)
+      webauthn (~> 3.0)
 
 PATH
   remote: modules/webhooks
@@ -331,14 +338,16 @@ GEM
       airbrake-ruby (~> 6.0)
     airbrake-ruby (6.2.2)
       rbtree3 (~> 0.6)
-    appsignal (3.6.0)
+    android_key_attestation (0.3.0)
+    appsignal (3.6.1)
       rack
     ast (2.4.2)
     attr_required (1.0.2)
     auto_strip_attributes (2.6.0)
       activerecord (>= 4.0)
     awesome_nested_set (3.6.0)
       activerecord (>= 4.0.0, < 7.2)
+    awrence (1.2.1)
     aws-eventstream (1.3.0)
     aws-partitions (1.895.0)
     aws-sdk-core (3.191.3)
@@ -407,6 +416,7 @@ GEM
     carrierwave_direct (2.1.0)
       carrierwave (>= 1.0.0)
       fog-aws
+    cbor (0.5.9.8)
     cgi (0.4.1)
     childprocess (5.0.0)
     climate_control (1.2.0)
@@ -425,6 +435,9 @@ GEM
     concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
     cookiejar (0.3.4)
+    cose (1.3.0)
+      cbor (~> 0.5.9)
+      openssl-signature_algorithm (~> 1.0)
     crack (1.0.0)
       bigdecimal
       rexml
@@ -446,13 +459,6 @@ GEM
     deckar01-task_list (2.3.4)
       html-pipeline (~> 2.0)
     declarative (0.0.20)
-    delayed_cron_job (0.9.0)
-      fugit (>= 1.5)
-    delayed_job (4.1.11)
-      activesupport (>= 3.0, < 8.0)
-    delayed_job_active_record (4.1.8)
-      activerecord (>= 3.0, < 8.0)
-      delayed_job (>= 3.0, < 5)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.5.1)
@@ -551,7 +557,7 @@ GEM
     friendly_id (5.5.1)
       activerecord (>= 4.0.0)
     front_matter_parser (1.0.1)
-    fugit (1.9.0)
+    fugit (1.10.1)
       et-orbi (~> 1, >= 1.2.7)
       raabro (~> 1.4)
     fuubar (2.5.1)
@@ -565,6 +571,13 @@ GEM
       i18n (>= 0.7)
       multi_json
       request_store (>= 1.0)
+    good_job (3.26.1)
+      activejob (>= 6.0.0)
+      activerecord (>= 6.0.0)
+      concurrent-ruby (>= 1.0.2)
+      fugit (>= 1.1)
+      railties (>= 6.0.0)
+      thor (>= 0.14.1)
     google-apis-core (0.14.0)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (~> 1.9)
@@ -766,6 +779,9 @@ GEM
       view_component (>= 3.1, < 4.0)
     openproject-token (4.0.0)
       activemodel
+    openssl (3.2.0)
+    openssl-signature_algorithm (1.3.0)
+      openssl (> 2.0)
     os (1.1.4)
     ox (2.14.17)
     paper_trail (15.1.0)
@@ -777,7 +793,7 @@ GEM
     parser (3.3.0.5)
       ast (~> 2.4.1)
       racc
-    pdf-core (0.9.0)
+    pdf-core (0.10.0)
     pdf-inspector (1.3.0)
       pdf-reader (>= 1.0, < 3.0.a)
     pdf-reader (2.12.0)
@@ -791,9 +807,10 @@ GEM
       activesupport (> 2.2.1)
       nokogiri (~> 1.10, >= 1.10.4)
       rubyzip (>= 1.2.0)
-    prawn (2.4.0)
-      pdf-core (~> 0.9.0)
-      ttfunk (~> 1.7)
+    prawn (2.5.0)
+      matrix (~> 0.4)
+      pdf-core (~> 0.10.0)
+      ttfunk (~> 1.8)
     prawn-table (0.2.2)
       prawn (>= 1.3.0, < 3.0.0)
     pry (0.14.2)
@@ -950,15 +967,15 @@ GEM
     rspec-retry (0.6.2)
       rspec-core (> 3.3)
     rspec-support (3.13.1)
-    rubocop (1.61.0)
+    rubocop (1.62.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
     rubocop-ast (1.31.1)
@@ -998,6 +1015,8 @@ GEM
     rubytree (2.0.3)
       json (~> 2.0, > 2.3.1)
     rubyzip (2.3.2)
+    safety_net_attestation (0.4.0)
+      jwt (~> 2.0)
     sanitize (6.1.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
@@ -1060,8 +1079,13 @@ GEM
     thread_safe (0.3.6)
     timecop (0.9.8)
     timeout (0.4.1)
+    tpm-key_attestation (0.12.0)
+      bindata (~> 2.4)
+      openssl (> 2.0)
+      openssl-signature_algorithm (~> 1.0)
     trailblazer-option (0.1.2)
-    ttfunk (1.7.0)
+    ttfunk (1.8.0)
+      bigdecimal (~> 3.1)
     turbo-rails (2.0.4)
       actionpack (>= 6.0.0)
       activejob (>= 6.0.0)
@@ -1097,6 +1121,15 @@ GEM
       rack (>= 2.0.9)
     warden-basic_auth (0.2.1)
       warden (~> 1.2)
+    webauthn (3.1.0)
+      android_key_attestation (~> 0.3.0)
+      awrence (~> 1.1)
+      bindata (~> 2.4)
+      cbor (~> 0.5.9)
+      cose (~> 1.1)
+      openssl (>= 2.2)
+      safety_net_attestation (~> 0.4.0)
+      tpm-key_attestation (~> 0.12.0)
     webfinger (2.1.3)
       activesupport
       faraday (~> 2.0)
@@ -1162,8 +1195,6 @@ DEPENDENCIES
   date_validator (~> 0.12.0)
   debug
   deckar01-task_list (~> 2.3.1)
-  delayed_cron_job (~> 0.9.0)
-  delayed_job_active_record (~> 4.1.5)
   disposable (~> 0.6.2)
   doorkeeper (~> 5.6.6)
   dotenv-rails
@@ -1181,6 +1212,7 @@ DEPENDENCIES
   friendly_id (~> 5.5.0)
   fuubar (~> 2.5.0)
   gon (~> 6.4.0)
+  good_job (~> 3.26.1)
   google-apis-gmail_v1
   googleauth
   grape (~> 2.0.0)
@@ -1225,6 +1257,7 @@ DEPENDENCIES
   openproject-documents!
   openproject-gantt!
   openproject-github_integration!
+  openproject-gitlab_integration!
   openproject-job_status!
   openproject-ldap_groups!
   openproject-meeting!

Gemfile.modules

@@ -33,6 +33,7 @@ group :opf_plugins do
   gem 'openproject-two_factor_authentication', path: 'modules/two_factor_authentication'
   gem 'openproject-webhooks',                  path: 'modules/webhooks'
   gem 'openproject-github_integration',        path: 'modules/github_integration'
+  gem 'openproject-gitlab_integration',        path: 'modules/gitlab_integration'
   gem 'openproject-ldap_groups',               path: 'modules/ldap_groups'
   gem 'openproject-recaptcha',                 path: 'modules/recaptcha'
   gem 'openproject-job_status',                path: 'modules/job_status'

Procfile.dev

@@ -1,3 +1,3 @@
 web: bundle exec rails server -p 3000 -b ${HOST:="127.0.0.1"} --environment ${RAILS_ENV:="development"}
 angular: npm run serve
-worker: bundle exec rake jobs:work
+worker: bundle exec good_job start

app/components/add_button_component.rb

@@ -71,7 +71,7 @@ def label_text
   end
 
   def link_css_class
-    'button -alt-highlight'
+    'button -primary'
   end
 
   def icon

app/components/filters_component.html.erb

@@ -123,7 +123,7 @@
           </div>
         </li>
         <li class="advanced-filters--controls">
-          <%= submit_tag t('button_apply'), class: 'button -small -highlight', name: nil %>
+          <%= submit_tag t('button_apply'), class: 'button -small -primary', name: nil %>
         </li>
       </ul>
       <% unless EnterpriseToken.allows_to?(:custom_fields_in_projects_list)%>

app/components/individual_principal_base_filter_component.html.erb

@@ -105,7 +105,7 @@ See COPYRIGHT and LICENSE files for more details.
         <%= text_field_tag 'name', params[:name], class: 'simple-filters--filter-value' %>
       </li>
       <li class="simple-filters--controls">
-        <%= submit_tag t(:button_apply), class: 'button -highlight -small', name: nil %>
+        <%= submit_tag t(:button_apply), class: 'button -primary -small', name: nil %>
         <%= link_to t(:button_clear), clear_url, class: 'button -small -with-icon icon-undo' %>
       </li>
     </ul>

app/components/members/role_form_component.html.erb

@@ -48,7 +48,7 @@ See COPYRIGHT and LICENSE files for more details.
   </p>
 
   <p>
-    <%= f.submit t(:button_change), class: "button -highlight -small" %>
+    <%= f.submit t(:button_change), class: "button -primary -small" %>
     <%= link_to t(:button_cancel),
                 '#',
                 data: {

app/components/open_project/common/attribute_component.html.erb

@@ -2,16 +2,25 @@
   data-controller="attribute"
   data-application-target="dynamic"
   class="op-long-text-attribute">
-  <p 
-    data-attribute-target="descriptionText"
-    class="op-long-text-attribute--text">
-    <%= @attr_value %>
-  </p>
 
-  <%= render(Primer::Alpha::Dialog.new(id: @id, title: @name, size: :large)) do |component|
-    component.with_show_button(scheme: :link, display: (is_multi_type(@description) ? :block : :none), data: { 'attribute-target': 'expandButton' }) { I18n.t('js.label_expand') }
-    component.with_body(mt: 2) { helpers.format_text(@description) }
-    component.with_header
+  <%= render(
+        Primer::Beta::Text.new(tag: :div,
+                               classes: ['op-long-text-attribute--text', PARAGRAPH_CSS_CLASS],
+                               color: text_color,
+                               data: {
+                                 'attribute-target': "descriptionText"
+                               })) { short_text } %>
+
+  <%= render(
+        Primer::Alpha::Dialog.new(id: id,
+                                  title: name,
+                                  size: :large)) do |component|
+      component.with_show_button(scheme: :link,
+                                 display: display_expand_button_value,
+                                 ml: 1,
+                                 data: { 'attribute-target': 'expandButton' }) { I18n.t('js.label_expand') }
+      component.with_body(mt: 2) { full_text }
+      component.with_header(variant: :large)
     end
   %>
-</div>
+</div>