kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix url helpers in RepositoryPush

Browse source
This commit is contained in:
Grzegorz Bizon 2015-11-22 20:59:31 +01:00
parent 9f2752e5dc
commit d835fbc79f
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/gitlab/email/message/repository_push.rb
View file

@ -16,6 +16,7 @@ module Gitlab
@project_id = project_id
@recipient = recipient
@opts = opts
@urls = Gitlab::Application.routes.url_helpers
@author_id = opts.delete(:author_id)
@ref = opts.delete(:ref)
@ -85,17 +86,17 @@ module Gitlab
def target_url
if @action == :push
if commits.length > 1 && compare
@notify.namespace_project_compare_url(project_namespace,
@urls.namespace_project_compare_url(project_namespace,
project,
from: Commit.new(compare.base, project),
to: Commit.new(compare.head, project))
else
@notify.namespace_project_commit_url(project_namespace,
@urls.namespace_project_commit_url(project_namespace,
project, commits.first)
end
else
unless @action == :delete
@notify.namespace_project_tree_url(project_namespace,
@urls.namespace_project_tree_url(project_namespace,
project, ref_name)
end
end