diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-01-18 11:37:16 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-01-18 11:37:16 +0000 |
| commit | 8e9c073a146f655cea2fd13f259bd68dc2c37259 (patch) | |
| tree | 01bd2ec14fd6406b1deb1947935b36463a7e4529 /spec/models/hooks | |
| parent | d617c24f59f9cc1c068301ec755caa2de6cd6b73 (diff) | |
| parent | 6ef1b94ccf9eb60d5cff43d7e1302129d1b43cc3 (diff) | |
| download | gitlab-ce-8e9c073a146f655cea2fd13f259bd68dc2c37259.tar.gz | |
Merge branch 'feature/merge-request-system-hook' into 'master'
System hooks for Merge Requests
See merge request gitlab-org/gitlab-ce!14387
Diffstat (limited to 'spec/models/hooks')
| -rw-r--r-- | spec/models/hooks/system_hook_spec.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/models/hooks/system_hook_spec.rb b/spec/models/hooks/system_hook_spec.rb index 0e965f541d8..8bc45715dcd 100644 --- a/spec/models/hooks/system_hook_spec.rb +++ b/spec/models/hooks/system_hook_spec.rb @@ -7,7 +7,8 @@ describe SystemHook do it 'sets defined default parameters' do attrs = { push_events: false, - repository_update_events: true + repository_update_events: true, + merge_requests_events: false } expect(system_hook).to have_attributes(attrs) end |