Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-13 00:06:30 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-13 00:06:30 +0300
commit6e3880e2bb5a404467c64edc916d9edf7556d09d (patch)
tree95cfb0de65623b7015b9d1a8c9ebb559a9358033 /app/mailers/emails/releases.rb
parent6d31b8f052d30b7e55128d17b66bceed8c6065a9 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/mailers/emails/releases.rb')
-rw-r--r--app/mailers/emails/releases.rb8
1 files changed, 7 insertions, 1 deletions
diff --git a/app/mailers/emails/releases.rb b/app/mailers/emails/releases.rb
index 137858d31e8..c9c77ab9333 100644
--- a/app/mailers/emails/releases.rb
+++ b/app/mailers/emails/releases.rb
@@ -21,7 +21,13 @@ module Emails
private
def release_email_subject
- release_info = [@release.name, @release.tag].select(&:presence).join(' - ')
+ release_info =
+ if @release.name == @release.tag
+ @release.tag
+ else
+ [@release.name, @release.tag].select(&:presence).join(' - ')
+ end
+
"New release: #{release_info}"
end
end