Add latest changes from gitlab-org/gitlab@master

2 files changed, 29 insertions, 0 deletions

diff --git a/app/mailers/emails/releases.rb b/app/mailers/emails/releases.rb
new file mode 100644
index 00000000000..137858d31e8
--- /dev/null
+++ b/app/mailers/emails/releases.rb
@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Emails
+  module Releases
+    def new_release_email(user_id, release, reason = nil)
+      @release = release
+      @project = @release.project
+      @target_url = namespace_project_releases_url(
+        namespace_id: @project.namespace,
+        project_id: @project
+      )
+
+      user = User.find(user_id)
+
+      mail(
+        to: user.notification_email_for(@project.group),
+        subject: subject(release_email_subject)
+      )
+    end
+
+    private
+
+    def release_email_subject
+      release_info = [@release.name, @release.tag].select(&:presence).join(' - ')
+      "New release: #{release_info}"
+    end
+  end
+end
diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb
index d0b43b4397f..c7cfefeec9b 100644
--- a/app/mailers/notify.rb
+++ b/app/mailers/notify.rb
@@ -16,6 +16,7 @@ class Notify < BaseMailer
   include Emails::Members
   include Emails::AutoDevops
   include Emails::RemoteMirrors
+  include Emails::Releases
 
   helper MilestonesHelper
   helper MergeRequestsHelper