diff options
| -rw-r--r-- | app/views/projects/jobs/_sidebar.html.haml | 7 | ||||
| -rw-r--r-- | changelogs/unreleased/36400-trigger-job.yml | 5 |
2 files changed, 9 insertions, 3 deletions
diff --git a/app/views/projects/jobs/_sidebar.html.haml b/app/views/projects/jobs/_sidebar.html.haml index b5067367802..eaef4cfd2de 100644 --- a/app/views/projects/jobs/_sidebar.html.haml +++ b/app/views/projects/jobs/_sidebar.html.haml @@ -44,9 +44,10 @@ %h4.title Trigger - %p - %span.build-light-text Token: - #{@build.trigger_request.trigger.short_token} + - if @build.trigger_request.trigger && @build.trigger_request.short_token + %p + %span.build-light-text Token: + #{@build.trigger_request.trigger.short_token} - if @build.trigger_variables.any? %p diff --git a/changelogs/unreleased/36400-trigger-job.yml b/changelogs/unreleased/36400-trigger-job.yml new file mode 100644 index 00000000000..27243813dc8 --- /dev/null +++ b/changelogs/unreleased/36400-trigger-job.yml @@ -0,0 +1,5 @@ +--- +title: Prevent 500 error when inspecting job after trigger was removed +merge_request: +author: +type: fixed |