From b831ef716b088fa5f0892ececd00d4a383267979 Mon Sep 17 00:00:00 2001
From: Lin Jen-Shin <godfat@godfat.org>
Date: Fri, 29 Jul 2016 02:05:50 +0800
Subject: [PATCH] They could be nil
---
lib/gitlab/data_builder/pipeline_data_builder.rb | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/gitlab/data_builder/pipeline_data_builder.rb b/lib/gitlab/data_builder/pipeline_data_builder.rb
index a9c1bc7acee..fed9bd92ba4 100644
--- a/lib/gitlab/data_builder/pipeline_data_builder.rb
+++ b/lib/gitlab/data_builder/pipeline_data_builder.rb
@@ -6,9 +6,9 @@ module Gitlab
def build(pipeline)
{
object_kind: 'pipeline',
- user: pipeline.user.hook_attrs,
+ user: pipeline.user.try(:hook_attrs),
project: pipeline.project.hook_attrs(backward: false),
- commit: pipeline.commit.hook_attrs,
+ commit: pipeline.commit.try(:hook_attrs),
object_attributes: hook_attrs(pipeline),
builds: pipeline.builds.map(&method(:build_hook_attrs))
}
@@ -43,8 +43,8 @@ module Gitlab
finished_at: build.finished_at,
when: build.when,
manual: build.manual?,
- user: build.user.hook_attrs,
- runner: runner_hook_attrs(build.runner),
+ user: build.user.try(:hook_attrs),
+ runner: build.runner && runner_hook_attrs(build.runner),
artifacts_file: {
filename: build.artifacts_file.filename,
size: build.artifacts_size
--
GitLab