Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
79b4fcc2
Commit
79b4fcc2
authored
May 28, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
3092b308
2714f85c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
1 deletion
+20
-1
changelogs/unreleased/9978-moved-code-differences-from-EE-to-CE.yml
.../unreleased/9978-moved-code-differences-from-EE-to-CE.yml
+5
-0
changelogs/unreleased/use-source-ref-name-in-webhook.yml
changelogs/unreleased/use-source-ref-name-in-webhook.yml
+5
-0
lib/gitlab/data_builder/pipeline.rb
lib/gitlab/data_builder/pipeline.rb
+1
-1
spec/lib/gitlab/data_builder/pipeline_spec.rb
spec/lib/gitlab/data_builder/pipeline_spec.rb
+9
-0
No files found.
changelogs/unreleased/9978-moved-code-differences-from-EE-to-CE.yml
0 → 100644
View file @
79b4fcc2
---
title
:
"
Moved
EE/CE
code
differences
for
`app/assets/javascripts/gl_dropdown.js`
into
CE"
merge_request
:
28711
author
:
Michel Engelen
type
:
other
changelogs/unreleased/use-source-ref-name-in-webhook.yml
0 → 100644
View file @
79b4fcc2
---
title
:
Use source ref in pipeline webhook
merge_request
:
28772
author
:
type
:
fixed
lib/gitlab/data_builder/pipeline.rb
View file @
79b4fcc2
...
...
@@ -19,7 +19,7 @@ module Gitlab
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
,
...
...
spec/lib/gitlab/data_builder/pipeline_spec.rb
View file @
79b4fcc2
...
...
@@ -50,5 +50,14 @@ describe Gitlab::DataBuilder::Pipeline do
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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment