Add latest changes from gitlab-org/gitlab@master

7 files changed, 29 insertions, 27 deletions

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 75a861423ed..e7af60beade 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -106,7 +106,7 @@ class UsersController < ApplicationController
 
   def calendar_activities
     @calendar_date = Date.parse(params[:date]) rescue Date.today
-    @events = contributions_calendar.events_by_date(@calendar_date)
+    @events = contributions_calendar.events_by_date(@calendar_date).map(&:present)
 
     render 'calendar_activities', layout: false
   end
diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb
index 0167f2ef698..f40755b9439 100644
--- a/app/helpers/events_helper.rb
+++ b/app/helpers/events_helper.rb
@@ -28,19 +28,7 @@ module EventsHelper
   end
 
   def event_action_name(event)
-    target =  if event.target_type
-                if event.design? || event.design_note?
-                  'design'
-                elsif event.wiki_page?
-                  'wiki page'
-                elsif event.note?
-                  event.note_target_type
-                else
-                  event.target_type.titleize.downcase
-                end
-              else
-                'project'
-              end
+    target = event.note_target_type_name || event.target_type_name
 
     [event.action_name, target].join(" ")
   end
@@ -229,7 +217,7 @@ module EventsHelper
   def event_note_title_html(event)
     if event.note_target
       capture do
-        concat content_tag(:span, event.note_target_type, class: "event-target-type gl-mr-2")
+        concat content_tag(:span, event.note_target_type_name, class: "event-target-type gl-mr-2")
         concat link_to(event.note_target_reference, event_note_target_url(event), title: event.target_title, class: 'has-tooltip event-target-link gl-mr-2')
       end
     else
diff --git a/app/models/event.rb b/app/models/event.rb
index 318599052e4..671def16151 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -329,14 +329,6 @@ class Event < ApplicationRecord
     end
   end
 
-  def note_target_type
-    if target.noteable_type.present?
-      target.noteable_type.titleize
-    else
-      "Wall"
-    end.downcase
-  end
-
   def body?
     if push_action?
       push_with_commits?
diff --git a/app/presenters/alert_management/alert_presenter.rb b/app/presenters/alert_management/alert_presenter.rb
index aafc18084fd..4bfa3dc9a13 100644
--- a/app/presenters/alert_management/alert_presenter.rb
+++ b/app/presenters/alert_management/alert_presenter.rb
@@ -12,7 +12,7 @@ module AlertManagement
 
     delegate :metrics_dashboard_url, :runbook, to: :parsed_payload
 
-    def initialize(alert, _attributes = {})
+    def initialize(alert, **attributes)
       super
 
       @alert = alert
diff --git a/app/presenters/event_presenter.rb b/app/presenters/event_presenter.rb
index 8f2388c2c31..c37721f7213 100644
--- a/app/presenters/event_presenter.rb
+++ b/app/presenters/event_presenter.rb
@@ -29,4 +29,26 @@ class EventPresenter < Gitlab::View::Presenter::Delegated
       ''
     end
   end
+
+  def target_type_name
+    if design?
+      'Design'
+    elsif wiki_page?
+      'Wiki Page'
+    elsif target_type.present?
+      target_type.titleize
+    else
+      "Project"
+    end.downcase
+  end
+
+  def note_target_type_name
+    return unless note?
+
+    if design_note?
+      'Design'
+    else
+      target.noteable_type.titleize
+    end.downcase
+  end
 end
diff --git a/app/services/static_site_editor/config_service.rb b/app/services/static_site_editor/config_service.rb
index 3be56790f7b..7b3115468a5 100644
--- a/app/services/static_site_editor/config_service.rb
+++ b/app/services/static_site_editor/config_service.rb
@@ -58,7 +58,7 @@ module StaticSiteEditor
 
     def load_generated_config
       Gitlab::StaticSiteEditor::Config::GeneratedConfig.new(
-        project.repository,
+        repository,
         ref,
         params.fetch(:path),
         params[:return_url]
@@ -75,7 +75,7 @@ module StaticSiteEditor
     end
 
     def yaml_from_repo
-      project.repository.blob_data_at(ref, static_site_editor_config_file)
+      repository.blob_data_at(ref, static_site_editor_config_file)
     rescue GRPC::NotFound
       # Return nil in the case of a GRPC::NotFound exception, so the default config will be used.
       # Allow any other unexpected exception will be tracked and re-raised.
diff --git a/app/views/events/event/_common.html.haml b/app/views/events/event/_common.html.haml
index a38d6dd3836..93c6efc9083 100644
--- a/app/views/events/event/_common.html.haml
+++ b/app/views/events/event/_common.html.haml
@@ -7,7 +7,7 @@
   - if event.target
     %span.event-type.d-inline-block.gl-mr-2{ class: event.action_name }
       = event.action_name
-    %span.event-target-type.gl-mr-2= event.target_type.titleize.downcase
+    %span.event-target-type.gl-mr-2= event.target_type_name
     = link_to event.target_link_options, class: 'has-tooltip event-target-link gl-mr-2', title: event.target_title do
       = event.target.reference_link_text
     - unless event.milestone?