diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-07-03 10:39:55 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-07-03 10:39:55 +0000 |
| commit | bdb64ac0a1396a7624adaf0670bb1bf4ad105b56 (patch) | |
| tree | 91b56163362fa29a5a3be1189d7c403c237b5a30 | |
| parent | d285356e94a45bfd9bb2e7ca8b4c07562d44fe76 (diff) | |
| parent | 2b78f223123dbbeabafb8b5d07e367a5ebad4567 (diff) | |
| download | gitlab-ce-bdb64ac0a1396a7624adaf0670bb1bf4ad105b56.tar.gz | |
Merge branch '36907-fix-new-issue-link-from-failed-job' into 'master'
Resolve "New issue from failed build no longer links to failed build"
Closes #36907
See merge request gitlab-org/gitlab-ce!20328
| -rw-r--r-- | app/serializers/build_details_entity.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/36907-fix-new-issue-link-from-failed-job.yml | 5 | ||||
| -rw-r--r-- | spec/features/projects/jobs_spec.rb | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/app/serializers/build_details_entity.rb b/app/serializers/build_details_entity.rb index ca4480fe2b1..2de9624aed4 100644 --- a/app/serializers/build_details_entity.rb +++ b/app/serializers/build_details_entity.rb @@ -35,7 +35,7 @@ class BuildDetailsEntity < JobEntity def build_failed_issue_options { title: "Job Failed ##{build.id}", - description: "Job [##{build.id}](#{project_job_path(project, build)}) failed for #{build.sha}:\n" } + description: "Job [##{build.id}](#{project_job_url(project, build)}) failed for #{build.sha}:\n" } end def current_user diff --git a/changelogs/unreleased/36907-fix-new-issue-link-from-failed-job.yml b/changelogs/unreleased/36907-fix-new-issue-link-from-failed-job.yml new file mode 100644 index 00000000000..80a50734f72 --- /dev/null +++ b/changelogs/unreleased/36907-fix-new-issue-link-from-failed-job.yml @@ -0,0 +1,5 @@ +--- +title: Fix link to job when creating a new issue from a failed job +merge_request: 20328 +author: +type: fixed diff --git a/spec/features/projects/jobs_spec.rb b/spec/features/projects/jobs_spec.rb index d2aaf60e72c..d06abdd999b 100644 --- a/spec/features/projects/jobs_spec.rb +++ b/spec/features/projects/jobs_spec.rb @@ -165,7 +165,7 @@ feature 'Jobs', :clean_gitlab_redis_shared_state do it 'links to issues/new with the title and description filled in' do button_title = "Job Failed ##{job.id}" - job_url = project_job_path(project, job) + job_url = project_job_url(project, job, host: page.server.host, port: page.server.port) options = { issue: { title: button_title, description: "Job [##{job.id}](#{job_url}) failed for #{job.sha}:\n" } } href = new_project_issue_path(project, options) |