Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42

1 files changed, 4 insertions, 6 deletions

diff --git a/app/models/event.rb b/app/models/event.rb
index a20ca0dc423..4c1793d3f13 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -10,9 +10,6 @@ class Event < ApplicationRecord
   include UsageStatistics
   include ShaAttribute
 
-  # TODO https://gitlab.com/gitlab-org/gitlab/-/issues/358088
-  default_scope { reorder(nil) } # rubocop:disable Cop/DefaultScope
-
   ACTIONS = HashWithIndifferentAccess.new(
     created: 1,
     updated: 2,
@@ -281,6 +278,7 @@ class Event < ApplicationRecord
       "opened"
     end
   end
+
   # rubocop: enable Metrics/CyclomaticComplexity
   # rubocop: enable Metrics/PerceivedComplexity
 
@@ -448,9 +446,9 @@ class Event < ApplicationRecord
 
   def design_action_names
     {
-      created: _('added'),
-      updated: _('updated'),
-      destroyed: _('removed')
+      created: 'added',
+      updated: 'updated',
+      destroyed: 'removed'
     }
   end