Release OpenProject 10.6.5

Author: oliverguenther

.github/workflows/docker.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Publish to registry
         uses: elgohr/Publish-Docker-Github-Action@master
         with:
-          name: openproject/community-test
+          name: openproject/community
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
           tag_semver: true

Gemfile

@@ -167,7 +167,7 @@ gem 'sprockets', '~> 3.7.0'
 # also, better than thin since we can control worker concurrency.
 gem 'unicorn'
 
-gem 'puma', '~> 4.3.1' # used for development and optionally for production
+gem 'puma', '~> 4.3.5' # used for development and optionally for production
 
 gem 'nokogiri', '~> 1.10.8'
 

Gemfile.lock

@@ -1080,7 +1080,7 @@ DEPENDENCIES
   pry-rescue (~> 1.5.0)
   pry-stack_explorer (~> 0.4.9.2)
   puffing-billy (~> 2.3.1)
-  puma (~> 4.3.1)
+  puma (~> 4.3.5)
   rack-attack (~> 6.2.2)
   rack-mini-profiler
   rack-protection (~> 2.0.8)

app/models/journal/aggregated_journal.rb

@@ -63,7 +63,9 @@ def containing_journal(pure_journal)
     # The +until_version+ parameter can be used in conjunction with the +journable+ parameter
     # to see the aggregated journals as if no versions were known after the specified version.
     def aggregated_journals(journable: nil, sql: nil, until_version: nil, includes: [])
-      raw_journals = Journal::Scopes::AggregatedJournal.fetch(journable: journable, sql: sql, until_version: until_version)
+      raw_journals = Journal::Scopes::AggregatedJournal
+        .fetch(journable: journable, sql: sql, until_version: until_version)
+        .order('version ASC')
 
       aggregated_journals = map_to_aggregated_journals(raw_journals)
       preload_associations(journable, aggregated_journals, includes)

app/models/journal/scopes/aggregated_journal.rb

@@ -41,6 +41,7 @@ def fetch(journable: nil, sql: nil, until_version: nil)
         # having to also use a CASE/COALESCE statement.
         Journal
           .from(select_sql(journals_preselection))
+          .select("DISTINCT *")
       end
 
       private

app/services/work_packages/set_schedule_service.rb

@@ -116,16 +116,13 @@ def reschedule_ancestor(scheduled, dependency)
   #    ancestors limits moving it. Then it is moved to the earliest date possible. This limitation is propagated transtitively
   #    to all following work packages.
   def reschedule_by_follows(scheduled, dependency)
-    delta = if dependency.follows_moved.first
-              date_rescheduling_delta(dependency.follows_moved.first.to)
-            else
-              0
-            end
-
+    delta = follows_delta(dependency)
     min_start_date = dependency.max_date_of_followed
 
     if delta.zero? && min_start_date
       reschedule_to_date(scheduled, min_start_date)
+    elsif !scheduled.start_date
+      schedule_on_missing_dates(scheduled, min_start_date)
     elsif !delta.zero?
       reschedule_by_delta(scheduled, delta, min_start_date)
     end
@@ -149,9 +146,24 @@ def reschedule_to_date(scheduled, date)
   end
 
   def reschedule_by_delta(scheduled, delta, min_start_date)
-    required_delta = [min_start_date - scheduled.start_date, [delta, 0].min].max
+    required_delta = [min_start_date - (scheduled.start_date || min_start_date), [delta, 0].min].max
 
     scheduled.start_date += required_delta
     scheduled.due_date += required_delta if scheduled.due_date
   end
+
+  # If the start_date of scheduled is nil at this point something
+  # went wrong before. So we fix it now by setting the date.
+  def schedule_on_missing_dates(scheduled, min_start_date)
+    scheduled.start_date = min_start_date
+    scheduled.due_date = scheduled.start_date + 1 if scheduled.due_date && scheduled.due_date < scheduled.start_date
+  end
+
+  def follows_delta(dependency)
+    if dependency.follows_moved.first
+      date_rescheduling_delta(dependency.follows_moved.first.to)
+    else
+      0
+    end
+  end
 end

app/views/activities/index.html.erb

@@ -84,7 +84,8 @@ See docs/COPYRIGHT.rdoc for more details.
 <% end %>
 
 <% content_for :header_tags do %>
-  <%= auto_discovery_link_tag(:atom, params.merge(format: 'atom', from: nil, key: User.current.rss_key)) %>
+  <%= auto_discovery_link_tag(:atom,
+                              { format: 'atom', from: nil, key: User.current.rss_key }) %>
 <% end %>
 
 <% content_for :sidebar do %>

app/views/groups/_memberships.html.erb

@@ -67,7 +67,7 @@ See docs/COPYRIGHT.rdoc for more details.
               <% @group.memberships.each do |membership| %>
                 <% next if membership.new_record? %>
                   <tr id="member-<%= membership.id %>" class="class">
-                    <td class="project"><%=h membership.project %></td>
+                    <td class="project"><%= link_to membership.project.name, project_members_path(membership.project) %></td>
                     <td class="roles">
                       <span id="member-<%= membership.id %>-roles"><%=h membership.roles.sort.collect(&:to_s).join(', ') %></span>
                       <%= labelled_tabular_form_for(:membership,

config/initializers/health_checks.rb

@@ -19,6 +19,53 @@ def check
   end
 end
 
+class PumaCheck < OkComputer::Check
+  attr_reader :threshold
+
+  def initialize(backlog_threshold)
+    @threshold = backlog_threshold.to_i
+  end
+
+  def check
+    stats = self.stats
+
+    return mark_message "N/A as Puma is not used." if stats.nil?
+
+    if stats[:running] > 0
+      mark_message "Puma is running"
+    else
+      mark_failure
+      mark_message "Puma is not running"
+    end
+
+    if stats[:backlog] < threshold
+      mark_message "Backlog ok"
+    else
+      mark_failure
+      mark_message "Backlog congested"
+    end
+  end
+
+  def stats
+    return nil unless applicable?
+    server = Puma::Server.current
+    return nil if server.nil?
+
+    {
+      backlog: server.backlog || 0,
+      running: server.running || 0,
+      pool_capacity: server.pool_capacity || 0,
+      max_threads: server.max_threads || 0
+    }
+  end
+
+  def applicable?
+    return @applicable unless @applicable.nil?
+
+    @applicable = Object.const_defined?("Puma::Server") && !Puma::Server.current.nil?
+  end
+end
+
 # Register delayed_job backed up test
 dj_max = OpenProject::Configuration.health_checks_jobs_queue_count_threshold
 OkComputer::Registry.register "delayed_jobs_backed_up",
@@ -28,8 +75,11 @@ def check
 OkComputer::Registry.register "delayed_jobs_never_ran",
                               DelayedJobNeverRanCheck.new(dj_never_ran_max)
 
+backlog_threshold = OpenProject::Configuration.health_checks_backlog_threshold
+OkComputer::Registry.register "puma", PumaCheck.new(backlog_threshold)
+
 # Make dj backed up optional due to bursts
-OkComputer.make_optional %w(delayed_jobs_backed_up)
+OkComputer.make_optional %w(delayed_jobs_backed_up puma)
 
 # Register web worker check for web + database
 OkComputer::CheckCollection.new('web').tap do |collection|
@@ -45,6 +95,7 @@ def check
   collection.register :mail, OkComputer::ActionMailerCheck.new
   collection.register :delayed_jobs_backed_up, OkComputer::Registry.fetch('delayed_jobs_backed_up')
   collection.register :delayed_jobs_never_ran, OkComputer::Registry.fetch('delayed_jobs_never_ran')
+  collection.register :puma, OkComputer::Registry.fetch('puma')
   OkComputer::Registry.default_collection.register 'full', collection
 end
 

config/locales/crowdin/ar.yml

@@ -418,7 +418,6 @@ ar:
         types: "الأنواع"
         versions: "الإصدارات"
         work_packages: "مجموعات العمل"
-        templated: 'Template project'
       projects/status:
         code: 'الحالة'
         explanation: 'Status description'
@@ -490,7 +489,6 @@ ar:
         parent_work_package: "الجذر"
         priority: "الأولوية"
         progress: "التقدم (%)"
-        schedule_manually: "Schedule manually"
         spent_hours: "الوقت المستهلك"
         spent_time: "الوقت المستهلك"
         subproject: "مشروع فرعي"
@@ -900,7 +898,6 @@ ar:
       - "تشرين الأول"
       - "تشرين الثاني"
       - "كانون الأول"
-    abbr_week: 'Wk'
     day_names:
       - "الأحد"
       - "الاثنين"
@@ -2031,12 +2028,6 @@ ar:
       warning_one: وسيكون أعضاء المشروع إلى نقل مستودعات للمشروع.
       warning_two: لن تعد تعمل الارتباطات الموجودة في المشروع.
       title: تغيير معرف المشروع
-    template:
-      copying: >
-        Your project is being created from the selected template project. You will be notified by mail as soon as the project is available.
-      use_template: 'Use template'
-      make_template: 'Set as template'
-      remove_from_templates: 'Remove from templates'
     archive:
       are_you_sure: "هل أنت متأكد من أنك تريد أرشفة المشروع '%{name}'؟"
       archived: "Archived"