Remove the email subject prefix

This changes email subjects from: GitLab | Team / Project | Note for issue #1234 to: Team / Project | Note for issue #1234 Rationale: * Emails should be as meaningful as possible, and emphasize content over chrome. The "GitLab" name is more chrome than content. * Users can tell an email coming from GitLab by the sender or the header in the email content. * An organization that works mainly with GitLab knows that every SVC email comes from GitLab. For these organizations, having "GitLab" in front of every email is just noise hiding the meaningful information.

Remove the email subject prefix
44ab156e · Pierre de La Morinerie · 49cb1c72 · 44ab156e · 44ab156e · 44ab156e
Commit 44ab156e authored Feb 17, 2014 by Pierre de La Morinerie
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 10 deletions

merge_requests.rb app/mailers/emails/merge_requests.rb +1 -1

notify.rb app/mailers/notify.rb +6 -6

notify_spec.rb spec/mailers/notify_spec.rb +3 -3

No files found.
--- a/app/mailers/emails/merge_requests.rb
+++ b/app/mailers/emails/merge_requests.rb
@@ -57,7 +57,7 @@ module Emails
  #   >> subject('Lorem ipsum', 'Dolor sit amet')
  #   => "GitLab Merge Request | Lorem ipsum | Dolor sit amet"
  def subject(*extra)
-    subject = "GitLab Merge Request |"
+    subject = "Merge Request | "
    if @merge_request.for_fork?
      subject << "#{@merge_request.source_project.name_with_namespace}:#{merge_request.source_branch} >> #{@merge_request.target_project.name_with_namespace}:#{merge_request.target_branch}"
    else

--- a/app/mailers/notify.rb
+++ b/app/mailers/notify.rb
@@ -43,21 +43,21 @@ class Notify < ActionMailer::Base
  # Examples
  #
  #   >> subject('Lorem ipsum')
-  #   => "GitLab | Lorem ipsum"
+  #   => "Lorem ipsum"
  #
  #   # Automatically inserts Project name when @project is set
  #   >> @project = Project.last
  #   => #<Project id: 1, name: "Ruby on Rails", path: "ruby_on_rails", ...>
  #   >> subject('Lorem ipsum')
-  #   => "GitLab | Ruby on Rails | Lorem ipsum "
+  #   => "Ruby on Rails | Lorem ipsum "
  #
  #   # Accepts multiple arguments
  #   >> subject('Lorem ipsum', 'Dolor sit amet')
-  #   => "GitLab | Lorem ipsum | Dolor sit amet"
+  #   => "Lorem ipsum | Dolor sit amet"
  def subject(*extra)
-    subject = "GitLab"
-    subject << (@project ? " | #{@project.name_with_namespace}" : "")
-    subject << " | " + extra.join(' | ') if extra.present?
+    subject = ""
+    subject << "#{@project.name_with_namespace} | " if @project
+    subject << extra.join(' | ') if extra.present?
    subject
  end
 end
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -24,7 +24,7 @@ describe Notify do
    end

    it 'has the correct subject' do
-      should have_subject /^gitlab \| Account was created for you$/i
+      should have_subject /^Account was created for you$/i
    end

    it 'contains the new user\'s login name' do
@@ -52,7 +52,7 @@ describe Notify do
    end

    it 'has the correct subject' do
-      should have_subject /^gitlab \| Account was created for you$/i
+      should have_subject /^Account was created for you$/i
    end

    it 'contains the new user\'s login name' do
@@ -78,7 +78,7 @@ describe Notify do
    end

    it 'has the correct subject' do
-      should have_subject /^gitlab \| SSH key was added to your account$/i
+      should have_subject /^SSH key was added to your account$/i
    end

    it 'contains the new ssh key title' do