merge_request: add work_in_progress to MR hooks
This commit is contained in:
parent
380392212f
commit
6b73902733
|
@ -53,6 +53,7 @@ v 8.0.3
|
|||
- Fix URL shown in Slack notifications
|
||||
- Fix bug where projects would appear to be stuck in the forked import state (Stan Hu)
|
||||
- Fix Error 500 in creating merge requests with > 1000 diffs (Stan Hu)
|
||||
- Add work_in_progress key to MR web hooks (Ben Boeckel)
|
||||
|
||||
v 8.0.2
|
||||
- Fix default avatar not rendering in network graph (Stan Hu)
|
||||
|
|
|
@ -275,7 +275,8 @@ class MergeRequest < ActiveRecord::Base
|
|||
attrs = {
|
||||
source: source_project.hook_attrs,
|
||||
target: target_project.hook_attrs,
|
||||
last_commit: nil
|
||||
last_commit: nil,
|
||||
work_in_progress: work_in_progress?
|
||||
}
|
||||
|
||||
unless last_commit.nil?
|
||||
|
|
|
@ -314,7 +314,8 @@ X-Gitlab-Event: Note Hook
|
|||
"name": "John Smith",
|
||||
"email": "john@example.com"
|
||||
}
|
||||
}
|
||||
},
|
||||
"work_in_progress": false
|
||||
}
|
||||
}
|
||||
```
|
||||
|
@ -500,6 +501,7 @@ X-Gitlab-Event: Merge Request Hook
|
|||
"email": "gitlabdev@dv6700.(none)"
|
||||
}
|
||||
},
|
||||
"work_in_progress": false,
|
||||
"url": "http://example.com/diaspora/merge_requests/1",
|
||||
"action": "open"
|
||||
}
|
||||
|
@ -537,4 +539,4 @@ When you press 'Test Hook' in GitLab, you should see something like this in the
|
|||
{"before":"077a85dd266e6f3573ef7e9ef8ce3343ad659c4e","after":"95cd4a99e93bc4bbabacfa2cd10e6725b1403c60",<SNIP>}
|
||||
example.com - - [14/May/2014:07:45:26 EDT] "POST / HTTP/1.1" 200 0
|
||||
- -> /
|
||||
```
|
||||
```
|
||||
|
|
|
@ -165,6 +165,17 @@ describe MergeRequest do
|
|||
end
|
||||
end
|
||||
|
||||
describe "#hook_attrs" do
|
||||
it "has all the required keys" do
|
||||
attrs = subject.hook_attrs
|
||||
attrs = attrs.to_h
|
||||
expect(attrs).to include(:source)
|
||||
expect(attrs).to include(:target)
|
||||
expect(attrs).to include(:last_commit)
|
||||
expect(attrs).to include(:work_in_progress)
|
||||
end
|
||||
end
|
||||
|
||||
it_behaves_like 'an editable mentionable' do
|
||||
subject { create(:merge_request) }
|
||||
|
||||
|
|
Loading…
Reference in New Issue