summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2017-09-13 07:28:58 +0000
committerJose Ivan Vargas <jvargas@gitlab.com>2017-09-15 23:06:57 -0500
commit258794bd4033ff1e5de319a94423a2e3b3a4c79d (patch)
tree81978a5ab418fe0d00494a94bad7be6c89184243
parente6022d6ddd336c428d063c220c00800734e352b9 (diff)
downloadgitlab-ce-258794bd4033ff1e5de319a94423a2e3b3a4c79d.tar.gz
Merge branch '36907-new-issue-from-failed-build-no-longer-links-to-failed-build' into 'master'9-5-stable-patch-5
Resolve "New issue from failed build no longer links to failed build" Closes #36907 See merge request !13790
-rw-r--r--app/helpers/builds_helper.rb2
-rw-r--r--app/serializers/build_details_entity.rb4
-rw-r--r--spec/features/projects/jobs_spec.rb6
3 files changed, 6 insertions, 6 deletions
diff --git a/app/helpers/builds_helper.rb b/app/helpers/builds_helper.rb
index 85bc784d53c..aa3a9a055a0 100644
--- a/app/helpers/builds_helper.rb
+++ b/app/helpers/builds_helper.rb
@@ -30,7 +30,7 @@ module BuildsHelper
def build_failed_issue_options
{
- title: "Build Failed ##{@build.id}",
+ title: "Job Failed ##{@build.id}",
description: project_job_url(@project, @build)
}
end
diff --git a/app/serializers/build_details_entity.rb b/app/serializers/build_details_entity.rb
index 743a08acefe..8c89eea607f 100644
--- a/app/serializers/build_details_entity.rb
+++ b/app/serializers/build_details_entity.rb
@@ -32,8 +32,8 @@ class BuildDetailsEntity < JobEntity
private
def build_failed_issue_options
- { title: "Build Failed ##{build.id}",
- description: project_job_path(project, build) }
+ { title: "Job Failed ##{build.id}",
+ description: "Job [##{build.id}](#{project_job_path(project, build)}) failed for #{build.sha}:\n" }
end
def current_user
diff --git a/spec/features/projects/jobs_spec.rb b/spec/features/projects/jobs_spec.rb
index 037ac00d39f..2e24455edca 100644
--- a/spec/features/projects/jobs_spec.rb
+++ b/spec/features/projects/jobs_spec.rb
@@ -164,9 +164,9 @@ feature 'Jobs' do
end
it 'links to issues/new with the title and description filled in' do
- button_title = "Build Failed ##{job.id}"
- job_path = project_job_path(project, job)
- options = { issue: { title: button_title, description: job_path } }
+ button_title = "Job Failed ##{job.id}"
+ job_url = project_job_path(project, job)
+ options = { issue: { title: button_title, description: "Job [##{job.id}](#{job_url}) failed for #{job.sha}:\n" } }
href = new_project_issue_path(project, options)