Merge branch 'release/11.4' into dev

app/views/digest_mailer/work_packages.html.erb

@@ -19,7 +19,9 @@
                   <%= digest_notification_timestamp_text(notification) %>
                 </td>
                 <td style="text-align: right">
-                  <%= I18n.t(:"mail.digests.work_packages.reason.#{notification.reason_mail_digest}") %>
+                  <%= I18n.t(
+                        :"mail.digests.work_packages.reason.#{notification.reason_mail_digest || :unknown}",
+                        default: '-') %>
                 </td>
                 <td width="20px"></td>
               </tr>
@@ -53,4 +55,4 @@
         </section>
     <% end %>
   </section>
-<% end %>
+<% end %>

db/migrate/20210615150558_aggregate_journals.rb

@@ -25,7 +25,7 @@ class AggregateJournals < ActiveRecord::Migration[6.1]
   # The change is irreversible (aggregated journals cannot be broken down) but down will not cause database inconsistencies.
 
   def aggregate_journals(klass)
-    klass.in_batches do |instances|
+    klass.in_batches(of: ENV["OPENPROJECT_MIGRATION_AGGREGATE_JOURNALS_BATCH_SIZE"]&.to_i || 1000) do |instances|
       # Instantiating is faster than calculating the aggregated journals multiple times.
       aggregated_journals = aggregated_journals_of(klass, instances).to_a
 

docs/system-admin-guide/users-permissions/settings/README.md

@@ -11,7 +11,7 @@ keywords: user settings
 
 The user settings sections covers general settings, such as the default language, user deletion and user consent.
 
-User settings are accessibly by administrators from the OpenProject administration.
+User settings are accessible by administrators from the OpenProject administration.
 
 ![user and permissions settings](image-20200211140959585.png)
 

frontend/src/app/features/user-preferences/notifications-settings/toolbar/notifications-settings-toolbar.component.html

@@ -4,19 +4,17 @@
       <h2 [textContent]="text.title"></h2>
     </div>
     <ul class="toolbar-items">
-      <li class="toolbar-item">
+      <li
+          *ngIf="(projectSettings$ | async).length > 0"
+          class="toolbar-item"
+      >
         <button
-            *ngIf="(projectSettings$ | async).length > 0"
             class="button"
             (click)="removeAll()"
         >
-          <span
-              class="button--text"
-              [textContent]="text.remove_projects"
-          >
-          </span>
+          <span [textContent]="text.remove_projects"></span>
         </button>
       </li>
     </ul>
   </div>
-</div>
+</div>