Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42

3 files changed, 5 insertions, 72 deletions

diff --git a/lib/gitlab/email/handler/service_desk_handler.rb b/lib/gitlab/email/handler/service_desk_handler.rb
index bb57494c729..71b1d4ed8f9 100644
--- a/lib/gitlab/email/handler/service_desk_handler.rb
+++ b/lib/gitlab/email/handler/service_desk_handler.rb
@@ -34,7 +34,7 @@ module Gitlab
 
           create_issue_or_note
 
-          if issue_creator_address
+          if from_address
             add_email_participant
             send_thank_you_email unless reply_email?
           end
@@ -98,7 +98,7 @@ module Gitlab
               title: mail.subject,
               description: message_including_template,
               confidential: true,
-              external_author: external_author
+              external_author: from_address
             },
             spam_params: nil
           ).execute
@@ -176,22 +176,8 @@ module Gitlab
           ).execute
         end
 
-        def issue_creator_address
-          reply_to_address || from_address
-        end
-
         def from_address
-          mail.from.first || mail.sender
-        end
-
-        def reply_to_address
-          (mail.reply_to || []).first
-        end
-
-        def external_author
-          return issue_creator_address unless reply_to_address && from_address
-
-          _("%{from_address} (reply to: %{reply_to_address})") % { from_address: from_address, reply_to_address: reply_to_address }
+          (mail.reply_to || []).first || mail.from.first || mail.sender
         end
 
         def can_handle_legacy_format?
@@ -205,7 +191,7 @@ module Gitlab
         def add_email_participant
           return if reply_email? && !Feature.enabled?(:issue_email_participants, @issue.project)
 
-          @issue.issue_email_participants.create(email: issue_creator_address)
+          @issue.issue_email_participants.create(email: from_address)
         end
       end
     end
diff --git a/lib/gitlab/email/message/in_product_marketing.rb b/lib/gitlab/email/message/in_product_marketing.rb
index ac9585bcd1a..bd2c91755c8 100644
--- a/lib/gitlab/email/message/in_product_marketing.rb
+++ b/lib/gitlab/email/message/in_product_marketing.rb
@@ -7,7 +7,7 @@ module Gitlab
         UnknownTrackError = Class.new(StandardError)
 
         def self.for(track)
-          valid_tracks = [Namespaces::InviteTeamEmailService::TRACK, Namespaces::InProductMarketingEmailsService::TRACKS.keys].flatten
+          valid_tracks = Namespaces::InProductMarketingEmailsService::TRACKS.keys
           raise UnknownTrackError unless valid_tracks.include?(track)
 
           "Gitlab::Email::Message::InProductMarketing::#{track.to_s.classify}".constantize
diff --git a/lib/gitlab/email/message/in_product_marketing/invite_team.rb b/lib/gitlab/email/message/in_product_marketing/invite_team.rb
deleted file mode 100644
index e9334b687f4..00000000000
--- a/lib/gitlab/email/message/in_product_marketing/invite_team.rb
+++ /dev/null
@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-module Gitlab
-  module Email
-    module Message
-      module InProductMarketing
-        class InviteTeam < Base
-          def subject_line
-            s_('InProductMarketing|Invite your teammates to GitLab')
-          end
-
-          def tagline
-            ''
-          end
-
-          def title
-            s_('InProductMarketing|GitLab is better with teammates to help out!')
-          end
-
-          def subtitle
-            ''
-          end
-
-          def body_line1
-            s_('InProductMarketing|Invite your teammates today and build better code together. You can even assign tasks to new teammates such as setting up CI/CD, to help get projects up and running.')
-          end
-
-          def body_line2
-            ''
-          end
-
-          def cta_text
-            s_('InProductMarketing|Invite your teammates to help')
-          end
-
-          def logo_path
-            'mailers/in_product_marketing/team-0.png'
-          end
-
-          def series?
-            false
-          end
-
-          private
-
-          def validate_series!
-            raise ArgumentError, "Only one email is sent for this track. Value of `series` should be 0." unless @series == 0
-          end
-        end
-      end
-    end
-  end
-end