summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-11-24 09:20:34 +0000
committerTim Zallmann <tzallmann@gitlab.com>2017-11-24 09:20:34 +0000
commit7e72fcaa095b77f7caac3fb6214ad21f7d6dd2b3 (patch)
treedeb65d3be6788e83d0831faadcc9a8425dbbbc3c /app/views
parent6078425118c27db2ffa394579316eb81cd231d83 (diff)
downloadgitlab-ce-7e72fcaa095b77f7caac3fb6214ad21f7d6dd2b3.tar.gz
Prevent 500 error when inspecting job after trigger was removed
Diffstat (limited to 'app/views')
-rw-r--r--app/views/projects/jobs/_sidebar.html.haml7
1 files changed, 4 insertions, 3 deletions
diff --git a/app/views/projects/jobs/_sidebar.html.haml b/app/views/projects/jobs/_sidebar.html.haml
index 17ac8a20a30..a71333497e6 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&.short_token
+ %p
+ %span.build-light-text Token:
+ #{@build.trigger_request.trigger.short_token}
- if @build.trigger_variables.any?
%p