diff options
author | Valery Sizov <vsv2711@gmail.com> | 2015-09-15 16:42:02 +0300 |
---|---|---|
committer | Valery Sizov <vsv2711@gmail.com> | 2015-09-15 17:43:17 +0300 |
commit | b87ca7500f174cc9a4e90b262b02aa9bf695fbee (patch) | |
tree | 252237f0ea72354fbd2ec140580bcca7503a400f /app/models | |
parent | 88b3195ecfd2d0d74c4e76ce79961cb6db2f8643 (diff) |
fix specs. Stage 7
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/project_services/ci/hip_chat_message.rb | 2 | ||||
-rw-r--r-- | app/models/project_services/ci/slack_message.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/models/project_services/ci/hip_chat_message.rb b/app/models/project_services/ci/hip_chat_message.rb index 3e9f99e7eaf..58825fe066c 100644 --- a/app/models/project_services/ci/hip_chat_message.rb +++ b/app/models/project_services/ci/hip_chat_message.rb @@ -11,7 +11,7 @@ module Ci lines.push("<a href=\"#{Ci::RoutesHelper.ci_project_url(project)}\">#{project.name}</a> - ") if commit.matrix? - lines.push("<a href=\"#{Ci::RoutesHelper.ci_project_ref_commit_url(project, commit.ref, commit.sha)}\">Commit ##{commit.id}</a></br>") + lines.push("<a href=\"#{Ci::RoutesHelper.ci_project_ref_commits_url(project, commit.ref, commit.sha)}\">Commit ##{commit.id}</a></br>") else first_build = commit.builds_without_retry.first lines.push("<a href=\"#{Ci::RoutesHelper.ci_project_build_url(project, first_build)}\">Build '#{first_build.name}' ##{first_build.id}</a></br>") diff --git a/app/models/project_services/ci/slack_message.rb b/app/models/project_services/ci/slack_message.rb index 7d884849bf3..491ace50111 100644 --- a/app/models/project_services/ci/slack_message.rb +++ b/app/models/project_services/ci/slack_message.rb @@ -46,10 +46,10 @@ module Ci def attachment_message out = "<#{Ci::RoutesHelper.ci_project_url(project)}|#{project_name}>: " if commit.matrix? - out << "Commit <#{Ci::RoutesHelper.ci_project_ref_commit_url(project, commit.ref, commit.sha)}|\##{commit.id}> " + out << "Commit <#{Ci::RoutesHelper.ci_project_ref_commits_url(project, commit.ref, commit.sha)}|\##{commit.id}> " else build = commit.builds_without_retry.first - out << "Build <#{Ci::RoutesHelper.ci_project_build_url(project, build)}|\##{build.id}> " + out << "Build <#{Ci::RoutesHelper.ci_project_build_path(project, build)}|\##{build.id}> " end out << "(<#{commit_sha_link}|#{commit.short_sha}>) " out << "of <#{commit_ref_link}|#{commit.ref}> " |