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
5031d80e
Commit
5031d80e
authored
Sep 16, 2019
by
Jesse Hall
Committed by
Nick Thomas
Sep 16, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix for #29676, MR webhooks will now show changes in assignees.
parent
8c1859a1
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
1 deletion
+23
-1
ee/changelogs/unreleased/29676-mr-webhooks-missing-assignee-changes.yml
...unreleased/29676-mr-webhooks-missing-assignee-changes.yml
+5
-0
lib/gitlab/hook_data/merge_request_builder.rb
lib/gitlab/hook_data/merge_request_builder.rb
+1
-0
spec/lib/gitlab/hook_data/issuable_builder_spec.rb
spec/lib/gitlab/hook_data/issuable_builder_spec.rb
+17
-1
No files found.
ee/changelogs/unreleased/29676-mr-webhooks-missing-assignee-changes.yml
0 → 100644
View file @
5031d80e
---
title
:
Restores data for assignee changes in merge request webhooks.
merge_request
:
16812
author
:
Jesse Hall @jessehall3
type
:
fixed
lib/gitlab/hook_data/merge_request_builder.rb
View file @
5031d80e
...
@@ -34,6 +34,7 @@ module Gitlab
...
@@ -34,6 +34,7 @@ module Gitlab
end
end
SAFE_HOOK_RELATIONS
=
%i[
SAFE_HOOK_RELATIONS
=
%i[
assignees
labels
labels
total_time_spent
total_time_spent
]
.
freeze
]
.
freeze
...
...
spec/lib/gitlab/hook_data/issuable_builder_spec.rb
View file @
5031d80e
...
@@ -42,7 +42,15 @@ describe Gitlab::HookData::IssuableBuilder do
...
@@ -42,7 +42,15 @@ describe Gitlab::HookData::IssuableBuilder do
[{
id:
1
,
title:
'foo'
}],
[{
id:
1
,
title:
'foo'
}],
[{
id:
1
,
title:
'foo'
},
{
id:
2
,
title:
'bar'
}]
[{
id:
1
,
title:
'foo'
},
{
id:
2
,
title:
'bar'
}]
],
],
total_time_spent:
[
1
,
2
]
total_time_spent:
[
1
,
2
],
assignees:
[
[],
[{
name:
"Foo Bar"
,
username:
"foobar"
,
avatar_url:
"http://www.example.com/my-avatar.jpg"
}]
]
}
}
end
end
let
(
:data
)
{
builder
.
build
(
user:
user
,
changes:
changes
)
}
let
(
:data
)
{
builder
.
build
(
user:
user
,
changes:
changes
)
}
...
@@ -58,6 +66,14 @@ describe Gitlab::HookData::IssuableBuilder do
...
@@ -58,6 +66,14 @@ describe Gitlab::HookData::IssuableBuilder do
total_time_spent:
{
total_time_spent:
{
previous:
1
,
previous:
1
,
current:
2
current:
2
},
assignees:
{
previous:
[],
current:
[{
name:
"Foo Bar"
,
username:
"foobar"
,
avatar_url:
"http://www.example.com/my-avatar.jpg"
}]
}
}
}))
}))
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