diff options
| author | James Edwards-Jones <jedwardsjones@gitlab.com> | 2018-02-19 02:47:37 +0300 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2018-03-07 20:50:10 +0300 |
| commit | 6253d4456a98613b419d766a03af7ff9b9fcf2af (patch) | |
| tree | 6776fed77ca12bd4da5f8efec3301df124e08bd8 /lib/gitlab/data_builder | |
| parent | d9ca76559f740bdeac78bcd9a7cfe60df5ef9795 (diff) | |
Backport changes from EE's GithubService integration
Adds detailed_status to pipeline hook data
Adds detailed_description option for Services
Integration edit page renders 404 if a service is disabled
Diffstat (limited to 'lib/gitlab/data_builder')
| -rw-r--r-- | lib/gitlab/data_builder/pipeline.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/gitlab/data_builder/pipeline.rb b/lib/gitlab/data_builder/pipeline.rb index e47fb85b5ee..1e283cc092b 100644 --- a/lib/gitlab/data_builder/pipeline.rb +++ b/lib/gitlab/data_builder/pipeline.rb @@ -22,6 +22,7 @@ module Gitlab sha: pipeline.sha, before_sha: pipeline.before_sha, status: pipeline.status, + detailed_status: pipeline.detailed_status(nil).label, stages: pipeline.stages_names, created_at: pipeline.created_at, finished_at: pipeline.finished_at, |