Merge remote-tracking branch 'origin/fix/44469/allow-clearing-on-sear…

…ch' into release/13.4

.github/workflows/docker.yml

@@ -12,7 +12,7 @@ on:
     inputs:
       tag:
         description: "The tag to release. Note that this happens by default on the tag push. Only run this action when something went wrong!"
-        required: true
+        required: false
 
 permissions:
   contents: read # to fetch code (actions/checkout)
@@ -23,7 +23,7 @@ env:
 jobs:
   build:
     if: github.repository == 'opf/openproject'
-    runs-on: [ self-hosted, aws, ubuntu22, x64, 2XL ]
+    runs-on: [ self-hosted, aws, ubuntu22, x64, L, "run-id=${{ github.run_id }}" ]
     strategy:
       matrix:
         include:
@@ -45,21 +45,31 @@ jobs:
         run: |
           if [[ ${{ github.event_name }} == 'push' ]]; then
             TAG_REF=${GITHUB_REF#refs/tags/}
+            CHECKOUT_REF=$GITHUB_REF
+          elif [[ ${{ github.event_name }} == 'schedule' ]]; then
+            TAG_REF=dev
+            CHECKOUT_REF=refs/heads/dev
           elif [[ ${{ github.event_name }} == 'workflow_dispatch' ]]; then
             TAG_REF=${{ inputs.tag }}
+            CHECKOUT_REF=${{ inputs.tag }}
+          else
+            echo "Unsupported event"
+            exit 1
+          fi
+          
+          if [ -z "$TAG_REF" ] || [ -z "$CHECKOUT_REF" ]; then
+            echo "No TAG_REF or CHECKOUT_REF set. Aborting"
+            exit 1
           fi
           
           VERSION=${TAG_REF#v}
           echo "Version: $VERSION"
           echo "::set-output name=version::$VERSION"
-      - name: Checkout current release
-        if: ${{ github.event_name == 'push' }}
-        uses: actions/checkout@v3
-      - name: Checkout specific version
-        if: ${{ github.event_name != 'push' }}
+          echo "::set-output name=checkout_ref::$CHECKOUT_REF"
+      - name: Checkout
         with:
-          ref: ${{ inputs.tag }}
-        uses: actions/checkout@v3
+          ref: ${{ steps.extract_version.outputs.checkout_ref }}
+        uses: actions/checkout@v4
       - name: Prepare docker files
         run: |
           cp ./docker/prod/Dockerfile ./Dockerfile
@@ -82,6 +92,7 @@ jobs:
           images: |
             ${{ env.REGISTRY_IMAGE }}
       - name: Build image
+        id: build
         uses: docker/build-push-action@v4
         with:
           context: .
@@ -104,7 +115,7 @@ jobs:
             -e SUPERVISORD_LOG_LEVEL=debug \
             -e OPENPROJECT_LOGIN__REQUIRED=false \
             -e OPENPROJECT_HTTPS=false \
-            ${{ fromJSON(steps.meta.outputs.json).tags[0] }}
+            ${{ steps.build.outputs.imageid }}
 
           sleep 60
 

.rubocop.yml

@@ -415,10 +415,9 @@ Style/SpecialGlobalVars:
 #   For the record: using single quotes does NOT have any performance advantages.
 #   Even if it did, this would be a silly argument.
 #
-# Ideally we would just use double quotes everywhere but since that would result
-# in innumerable rubocop offenses we will just disable this. Quote away.
+# Quote away.
 Style/StringLiterals:
-  Enabled: false
+  EnforcedStyle: double_quotes
 
 Style/TrivialAccessors:
   Enabled: false

Gemfile

@@ -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.1.0'
+gem 'json_schemer', '~> 2.2.0'
 gem 'ruby-duration', '~> 3.2.0'
 
 # `config/initializers/mail_starttls_patch.rb` has also been patched to
@@ -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

@@ -339,7 +339,7 @@ GEM
     airbrake-ruby (6.2.2)
       rbtree3 (~> 0.6)
     android_key_attestation (0.3.0)
-    appsignal (3.6.1)
+    appsignal (3.6.2)
       rack
     ast (2.4.2)
     attr_required (1.0.2)
@@ -349,7 +349,7 @@ GEM
       activerecord (>= 4.0.0, < 7.2)
     awrence (1.2.1)
     aws-eventstream (1.3.0)
-    aws-partitions (1.895.0)
+    aws-partitions (1.896.0)
     aws-sdk-core (3.191.3)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.651.0)
@@ -459,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)
@@ -525,7 +518,7 @@ GEM
       tzinfo
     eventmachine (1.2.7)
     eventmachine_httpserver (0.2.1)
-    excon (0.109.0)
+    excon (0.110.0)
     factory_bot (6.4.6)
       activesupport (>= 5.0.0)
     factory_bot_rails (6.4.3)
@@ -545,7 +538,7 @@ GEM
       websocket-driver (>= 0.6, < 0.8)
     ffi (1.16.3)
     flamegraph (0.9.5)
-    fog-aws (3.21.0)
+    fog-aws (3.21.1)
       fog-core (~> 2.1)
       fog-json (~> 1.1)
       fog-xml (~> 0.1)
@@ -564,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)
@@ -578,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)
@@ -624,7 +624,7 @@ GEM
     httpclient (2.8.3)
     httpx (1.2.3)
       http-2-next (>= 1.0.3)
-    i18n (1.14.1)
+    i18n (1.14.4)
       concurrent-ruby (~> 1.0)
     i18n-js (4.2.3)
       glob (>= 0.4.0)
@@ -646,7 +646,7 @@ GEM
     ice_nine (0.11.2)
     interception (0.5)
     io-console (0.7.2)
-    irb (1.11.2)
+    irb (1.12.0)
       rdoc
       reline (>= 0.4.2)
     iso8601 (0.13.0)
@@ -661,7 +661,9 @@ GEM
       faraday-follow_redirects
     json-schema (4.1.1)
       addressable (>= 2.8)
-    json_schemer (2.1.1)
+    json_schemer (2.2.0)
+      base64
+      bigdecimal
       hana (~> 1.3)
       regexp_parser (~> 2.0)
       simpleidn (~> 0.2)
@@ -694,7 +696,7 @@ GEM
     loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
-    lookbook (2.2.1)
+    lookbook (2.2.2)
       activemodel
       css_parser
       htmlbeautifier (~> 1.3)
@@ -704,7 +706,7 @@ GEM
       redcarpet (~> 3.5)
       rouge (>= 3.26, < 5.0)
       view_component (>= 2.0)
-      yard (~> 0.9.25)
+      yard (~> 0.9)
       zeitwerk (~> 2.5)
     mail (2.8.1)
       mini_mime (>= 0.1.1)
@@ -720,7 +722,7 @@ GEM
     method_source (1.0.0)
     mime-types (3.5.2)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2024.0206)
+    mime-types-data (3.2024.0305)
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.5)
@@ -899,7 +901,7 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    rails-i18n (7.0.8)
+    rails-i18n (7.0.9)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 8)
     railties (7.1.3.2)
@@ -923,7 +925,7 @@ GEM
     redcarpet (3.6.0)
     redis (5.1.0)
       redis-client (>= 0.17.0)
-    redis-client (0.20.0)
+    redis-client (0.21.0)
       connection_pool
     regexp_parser (2.9.0)
     reline (0.4.3)
@@ -967,7 +969,7 @@ GEM
     rspec-retry (0.6.2)
       rspec-core (> 3.3)
     rspec-support (3.13.1)
-    rubocop (1.62.0)
+    rubocop (1.62.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -978,7 +980,7 @@ GEM
       rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.1)
+    rubocop-ast (1.31.2)
       parser (>= 3.3.0.4)
     rubocop-capybara (2.20.0)
       rubocop (~> 1.41)
@@ -1073,7 +1075,7 @@ GEM
     table_print (1.5.7)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    test-prof (1.3.1)
+    test-prof (1.3.2)
     text-hyphen (1.5.0)
     thor (1.3.1)
     thread_safe (0.3.6)
@@ -1086,7 +1088,7 @@ GEM
     trailblazer-option (0.1.2)
     ttfunk (1.8.0)
       bigdecimal (~> 3.1)
-    turbo-rails (2.0.4)
+    turbo-rails (2.0.5)
       actionpack (>= 6.0.0)
       activejob (>= 6.0.0)
       railties (>= 6.0.0)
@@ -1195,8 +1197,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
@@ -1214,6 +1214,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)
@@ -1224,7 +1225,7 @@ DEPENDENCIES
   httpx
   i18n-js (~> 4.2.3)
   i18n-tasks (~> 1.0.13)
-  json_schemer (~> 2.1.0)
+  json_schemer (~> 2.2.0)
   json_spec (~> 1.1.4)
   ladle
   launchy (~> 3.0.0)

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/contracts/settings/working_days_params_contract.rb

@@ -42,7 +42,7 @@ def working_days_are_present
     end
 
     def unique_job
-      if WorkPackages::ApplyWorkingDaysChangeJob.scheduled?
+      WorkPackages::ApplyWorkingDaysChangeJob.new.check_concurrency do
         errors.add :base, :previous_working_day_changes_unprocessed
       end
     end

app/controllers/custom_styles_controller.rb

@@ -197,7 +197,6 @@ def file_delete(remove_method)
     end
 
     @custom_style.send(remove_method)
-    @custom_style.save
     redirect_to custom_style_path
   end
 end

app/models/custom_style.rb

@@ -35,7 +35,7 @@ def digest
       image = send(name)
       image&.remove!
 
-      update_column name, nil
+      update_columns(name => nil, updated_at: Time.zone.now)
     end
   end
 end