Fix EmailsOnPush comparison link to include first commit.

2 files changed, 3 insertions, 3 deletions

diff --git a/app/mailers/emails/projects.rb b/app/mailers/emails/projects.rb
index 5c38601c1ba..9ea121d83a4 100644
--- a/app/mailers/emails/projects.rb
+++ b/app/mailers/emails/projects.rb
@@ -31,8 +31,8 @@ module Emails
       if @commits.length > 1
         @target_url = namespace_project_compare_url(@project.namespace,
                                                     @project,
-                                                    from: @commits.first,
-                                                    to: @commits.last)
+                                                    from: Commit.new(@compare.base),
+                                                    to:   Commit.new(@compare.head))
         @subject << "Deleted " if @reverse_compare
         @subject << "#{@commits.length} commits: #{@commits.first.title}"
       else
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb
index 534ab05942c..4090fa46205 100644
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -568,7 +568,7 @@ describe Notify do
     let(:user) { create(:user) }
     let(:compare) { Gitlab::Git::Compare.new(project.repository.raw_repository, sample_image_commit.id, sample_commit.id) }
     let(:commits) { Commit.decorate(compare.commits) }
-    let(:diff_path) { namespace_project_compare_path(project.namespace, project, from: commits.first, to: commits.last) }
+    let(:diff_path) { namespace_project_compare_path(project.namespace, project, from: Commit.new(compare.base), to: Commit.new(compare.head)) }
     let(:send_from_committer_email) { false }
 
     subject { Notify.repository_push_email(project.id, 'devs@company.name', user.id, 'master', compare, false, send_from_committer_email) }