Fix routing in CI mailer
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
parent
82b6a17ca7
commit
8dcc8e5db6
|
@ -11,7 +11,7 @@ module Ci
|
||||||
def to_s
|
def to_s
|
||||||
lines = Array.new
|
lines = Array.new
|
||||||
lines.push("<a href=\"#{ci_project_url(project)}\">#{project.name}</a> - ")
|
lines.push("<a href=\"#{ci_project_url(project)}\">#{project.name}</a> - ")
|
||||||
lines.push("<a href=\"#{ci_project_commits_url(project, commit.sha)}\">Commit ##{commit.id}</a></br>")
|
lines.push("<a href=\"#{ci_namespace_project_commit_url(commit.gl_project.namespace, commit.gl_project, commit.sha)}\">Commit ##{commit.id}</a></br>")
|
||||||
lines.push("#{commit.short_sha} #{commit.git_author_name} - #{commit.git_commit_message}</br>")
|
lines.push("#{commit.short_sha} #{commit.git_author_name} - #{commit.git_commit_message}</br>")
|
||||||
lines.push("#{humanized_status(commit_status)} in #{commit.duration} second(s).")
|
lines.push("#{humanized_status(commit_status)} in #{commit.duration} second(s).")
|
||||||
lines.join('')
|
lines.join('')
|
||||||
|
|
|
@ -28,7 +28,7 @@ module Ci
|
||||||
next unless build.failed?
|
next unless build.failed?
|
||||||
fields << {
|
fields << {
|
||||||
title: build.name,
|
title: build.name,
|
||||||
value: "Build <#{ci_project_build_url(project, build)}|\##{build.id}> failed in #{build.duration.to_i} second(s)."
|
value: "Build <#{namespace_project_build_url(build.gl_project.namespace, build.gl_project, build)}|\##{build.id}> failed in #{build.duration.to_i} second(s)."
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -45,7 +45,7 @@ module Ci
|
||||||
|
|
||||||
def attachment_message
|
def attachment_message
|
||||||
out = "<#{ci_project_url(project)}|#{project_name}>: "
|
out = "<#{ci_project_url(project)}|#{project_name}>: "
|
||||||
out << "Commit <#{ci_project_commits_url(project, commit.sha)}|\##{commit.id}> "
|
out << "Commit <#{ci_namespace_project_commit_url(commit.gl_project.namespace, commit.gl_project, commit.sha)}|\##{commit.id}> "
|
||||||
out << "(<#{commit_sha_link}|#{commit.short_sha}>) "
|
out << "(<#{commit_sha_link}|#{commit.short_sha}>) "
|
||||||
out << "of <#{commit_ref_link}|#{commit.ref}> "
|
out << "of <#{commit_ref_link}|#{commit.ref}> "
|
||||||
out << "by #{commit.git_author_name} " if commit.git_author_name
|
out << "by #{commit.git_author_name} " if commit.git_author_name
|
||||||
|
|
|
@ -71,7 +71,7 @@ class GitlabCiService < CiService
|
||||||
|
|
||||||
def build_page(sha, ref)
|
def build_page(sha, ref)
|
||||||
if project.gitlab_ci_project.present?
|
if project.gitlab_ci_project.present?
|
||||||
ci_project_commits_url(project.gitlab_ci_project, sha)
|
ci_namespace_project_commit_url(project.namespace, project, sha)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -16,4 +16,4 @@
|
||||||
Message: #{@build.commit.git_commit_message}
|
Message: #{@build.commit.git_commit_message}
|
||||||
|
|
||||||
%p
|
%p
|
||||||
Url: #{link_to @build.short_sha, ci_project_build_url(@project, @build)}
|
Url: #{link_to @build.short_sha, namespace_project_build_url(@build.gl_project.namespace, @build.gl_project, @build)}
|
||||||
|
|
|
@ -6,4 +6,4 @@ Author: <%= @build.commit.git_author_name %>
|
||||||
Branch: <%= @build.ref %>
|
Branch: <%= @build.ref %>
|
||||||
Message: <%= @build.commit.git_commit_message %>
|
Message: <%= @build.commit.git_commit_message %>
|
||||||
|
|
||||||
Url: <%= ci_project_build_url(@build.project, @build) %>
|
Url: <%= namespace_project_build_url(@build.gl_project.namespace, @build.gl_project, @build) %>
|
||||||
|
|
|
@ -17,4 +17,4 @@
|
||||||
Message: #{@build.commit.git_commit_message}
|
Message: #{@build.commit.git_commit_message}
|
||||||
|
|
||||||
%p
|
%p
|
||||||
Url: #{link_to @build.short_sha, ci_project_build_url(@project, @build)}
|
Url: #{link_to @build.short_sha, namespace_project_build_url(@build.gl_project.namespace, @build.gl_project, @build)}
|
||||||
|
|
|
@ -6,4 +6,4 @@ Author: <%= @build.commit.git_author_name %>
|
||||||
Branch: <%= @build.ref %>
|
Branch: <%= @build.ref %>
|
||||||
Message: <%= @build.commit.git_commit_message %>
|
Message: <%= @build.commit.git_commit_message %>
|
||||||
|
|
||||||
Url: <%= ci_project_build_url(@build.project, @build) %>
|
Url: <%= namespace_project_build_url(@build.gl_project.namespace, @build.gl_project, @build) %>
|
||||||
|
|
|
@ -39,8 +39,7 @@ describe GitlabCiService do
|
||||||
end
|
end
|
||||||
|
|
||||||
describe :build_page do
|
describe :build_page do
|
||||||
it { expect(@service.build_page("2ab7834c", 'master')).to eq("http://localhost/ci/projects/#{@ci_project.id}/commits/2ab7834c")}
|
it { expect(@service.build_page("2ab7834c", 'master')).to eq("http://localhost/#{@ci_project.gl_project.path_with_namespace}/commit/2ab7834c/ci")}
|
||||||
it { expect(@service.build_page("issue#2", 'master')).to eq("http://localhost/ci/projects/#{@ci_project.id}/commits/issue%232")}
|
|
||||||
end
|
end
|
||||||
|
|
||||||
describe "execute" do
|
describe "execute" do
|
||||||
|
|
Loading…
Reference in New Issue