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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
eb912a53
Commit
eb912a53
authored
Sep 24, 2015
by
Ben Boeckel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
api: add enable_ssl_verification to PUT/POST hooks
parent
b07f48d5
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
doc/api/projects.md
doc/api/projects.md
+2
-0
lib/api/project_hooks.rb
lib/api/project_hooks.rb
+4
-2
No files found.
doc/api/projects.md
View file @
eb912a53
...
@@ -538,6 +538,7 @@ Parameters:
...
@@ -538,6 +538,7 @@ Parameters:
-
`merge_requests_events`
- Trigger hook on merge_requests events
-
`merge_requests_events`
- Trigger hook on merge_requests events
-
`tag_push_events`
- Trigger hook on push_tag events
-
`tag_push_events`
- Trigger hook on push_tag events
-
`note_events`
- Trigger hook on note events
-
`note_events`
- Trigger hook on note events
-
`enable_ssl_verification`
- Do SSL verification when triggering the hook
### Edit project hook
### Edit project hook
...
@@ -557,6 +558,7 @@ Parameters:
...
@@ -557,6 +558,7 @@ Parameters:
-
`merge_requests_events`
- Trigger hook on merge_requests events
-
`merge_requests_events`
- Trigger hook on merge_requests events
-
`tag_push_events`
- Trigger hook on push_tag events
-
`tag_push_events`
- Trigger hook on push_tag events
-
`note_events`
- Trigger hook on note events
-
`note_events`
- Trigger hook on note events
-
`enable_ssl_verification`
- Do SSL verification when triggering the hook
### Delete project hook
### Delete project hook
...
...
lib/api/project_hooks.rb
View file @
eb912a53
...
@@ -44,7 +44,8 @@ module API
...
@@ -44,7 +44,8 @@ module API
:issues_events
,
:issues_events
,
:merge_requests_events
,
:merge_requests_events
,
:tag_push_events
,
:tag_push_events
,
:note_events
:note_events
,
:enable_ssl_verification
]
]
@hook
=
user_project
.
hooks
.
new
(
attrs
)
@hook
=
user_project
.
hooks
.
new
(
attrs
)
...
@@ -75,7 +76,8 @@ module API
...
@@ -75,7 +76,8 @@ module API
:issues_events
,
:issues_events
,
:merge_requests_events
,
:merge_requests_events
,
:tag_push_events
,
:tag_push_events
,
:note_events
:note_events
,
:enable_ssl_verification
]
]
if
@hook
.
update_attributes
attrs
if
@hook
.
update_attributes
attrs
...
...
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