GitLab wurde aktualisiert. Dank regelmäßiger Updates bleibt das THM GitLab sicher und Sie profitieren von den neuesten Funktionen. Vielen Dank für Ihre Geduld.

Commit 2714f85c authored by Ash McKenzie's avatar Ash McKenzie
Browse files

Merge branch 'use-source-ref-name-in-webhook' into 'master'

Use source ref in pipeline webhook

Closes #61553

See merge request gitlab-org/gitlab-ce!28772
parents 85b5d31a 7e05f3b7
---
title: Use source ref in pipeline webhook
merge_request: 28772
author:
type: fixed
......@@ -19,7 +19,7 @@ def build(pipeline)
def hook_attrs(pipeline)
{
id: pipeline.id,
ref: pipeline.ref,
ref: pipeline.source_ref,
tag: pipeline.tag,
sha: pipeline.sha,
before_sha: pipeline.before_sha,
......
......@@ -50,5 +50,14 @@
it { expect(attributes[:variables]).to be_a(Array) }
it { expect(attributes[:variables]).to contain_exactly({ key: 'TRIGGER_KEY_1', value: 'TRIGGER_VALUE_1' }) }
end
context 'when pipeline is a detached merge request pipeline' do
let(:merge_request) { create(:merge_request, :with_detached_merge_request_pipeline) }
let(:pipeline) { merge_request.all_pipelines.first }
it 'returns a source ref' do
expect(attributes[:ref]).to eq(merge_request.source_branch)
end
end
end
end
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment