Merge branch 'design-management-activity' into 'master'

Update design management wording in activity feed

See merge request gitlab-org/gitlab!67599

app/models/event.rb

@@ -434,9 +434,9 @@ class Event < ApplicationRecord
 
   def design_action_names
     {
-      created: _('uploaded'),
-      updated: _('revised'),
-      destroyed: _('deleted')
+      created: _('added'),
+      updated: _('updated'),
+      destroyed: _('removed')
     }
   end
 

locale/gitlab.pot

@@ -38490,6 +38490,9 @@ msgstr[1] ""
 msgid "access:"
 msgstr ""
 
+msgid "added"
+msgstr ""
+
 msgid "added %{created_at_timeago}"
 msgstr ""
 
@@ -39852,6 +39855,9 @@ msgstr ""
 msgid "remove weight"
 msgstr ""
 
+msgid "removed"
+msgstr ""
+
 msgid "removed a Zoom call from this issue"
 msgstr ""
 
@@ -39872,9 +39878,6 @@ msgstr ""
 msgid "reset it."
 msgstr ""
 
-msgid "revised"
-msgstr ""
-
 msgid "satisfied"
 msgstr ""
 
@@ -40046,9 +40049,6 @@ msgstr ""
 msgid "updated %{time_ago}"
 msgstr ""
 
-msgid "uploaded"
-msgstr ""
-
 msgid "uploads"
 msgstr ""
 

spec/controllers/dashboard/projects_controller_spec.rb

@@ -179,7 +179,7 @@ RSpec.describe Dashboard::ProjectsController, :aggregate_failures do
           expect(response).to render_template('dashboard/projects/index')
           expect(response.body).to include(
             "pushed to project",
-            "uploaded design #{design.to_reference}",
+            "added design #{design.to_reference}",
             "created wiki page #{wiki_page.title}",
             "joined project #{project.full_name}",
             "closed issue #{issue.to_reference}"

spec/features/projects/activity/user_sees_design_activity_spec.rb

@@ -34,26 +34,26 @@ RSpec.describe 'Projects > Activity > User sees design Activity', :js do
       visit activity_project_path(project)
 
       expect(page).to have_content('joined project')
-      expect(page).to have_content(design_activity(uploader, 'uploaded'))
-      expect(page).to have_content(design_activity(editor, 'revised'))
-      expect(page).to have_content(design_activity(deleter, 'deleted'))
+      expect(page).to have_content(design_activity(uploader, 'added'))
+      expect(page).to have_content(design_activity(editor, 'updated'))
+      expect(page).to have_content(design_activity(deleter, 'removed'))
     end
 
     it 'allows filtering out the design events', :aggregate_failures do
       visit activity_project_path(project, event_filter: EventFilter::ISSUE)
 
-      expect(page).not_to have_content(design_activity(uploader, 'uploaded'))
-      expect(page).not_to have_content(design_activity(editor, 'revised'))
-      expect(page).not_to have_content(design_activity(deleter, 'deleted'))
+      expect(page).not_to have_content(design_activity(uploader, 'added'))
+      expect(page).not_to have_content(design_activity(editor, 'updated'))
+      expect(page).not_to have_content(design_activity(deleter, 'removed'))
     end
 
     it 'allows filtering in the design events', :aggregate_failures do
       visit activity_project_path(project, event_filter: EventFilter::DESIGNS)
 
       expect(page).not_to have_content('joined project')
-      expect(page).to have_content(design_activity(uploader, 'uploaded'))
-      expect(page).to have_content(design_activity(editor, 'revised'))
-      expect(page).to have_content(design_activity(deleter, 'deleted'))
+      expect(page).to have_content(design_activity(uploader, 'added'))
+      expect(page).to have_content(design_activity(editor, 'updated'))
+      expect(page).to have_content(design_activity(deleter, 'removed'))
     end
   end
 

spec/models/event_spec.rb

@@ -982,9 +982,9 @@ RSpec.describe Event do
         build(:design_event, trait).action_name
       end
 
-      expect(created).to eq('uploaded')
-      expect(updated).to eq('revised')
-      expect(destroyed).to eq('deleted')
+      expect(created).to eq('added')
+      expect(updated).to eq('updated')
+      expect(destroyed).to eq('removed')
     end
 
     it 'handles correct push_action' do