diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-08-18 17:49:32 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2016-08-18 17:54:07 +0300 |
| commit | 8b1656282bcc39a0c1c7a3dccf74c98b1c3adae2 (patch) | |
| tree | a5375c1ff8150d7777a120f29cfbd4d544ca4865 /app/controllers/projects/hooks_controller.rb | |
| parent | 21a73302e8a8b9f22e51f1707a306f04d3faad07 (diff) | |
| parent | 2c1062f81e3c39cf8a45185c203995a43b91bf65 (diff) | |
Merge branch 'master' into expiration-date-on-memberships
Diffstat (limited to 'app/controllers/projects/hooks_controller.rb')
| -rw-r--r-- | app/controllers/projects/hooks_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/projects/hooks_controller.rb b/app/controllers/projects/hooks_controller.rb index a60027ff477..b5624046387 100644 --- a/app/controllers/projects/hooks_controller.rb +++ b/app/controllers/projects/hooks_controller.rb @@ -56,6 +56,7 @@ class Projects::HooksController < Projects::ApplicationController def hook_params params.require(:hook).permit( :build_events, + :pipeline_events, :enable_ssl_verification, :issues_events, :merge_requests_events, |