diff options
| author | Oliver Poignant <oliver@poignant.se> | 2016-08-26 23:07:35 +0200 |
|---|---|---|
| committer | Oliver Poignant <oliver@poignant.se> | 2016-08-26 23:07:35 +0200 |
| commit | 91a80671f91753324cfc66685586fc6a55c38e7b (patch) | |
| tree | b6ff14d04f38e6b6a35ba91ebb0dca080d5426df /gitautodeploy/httpserver.py | |
| parent | 9f08e1300d43261ca5d57d56ce657cbeef6e056f (diff) | |
| parent | 8e9f5e90c9f1a7aacb4fc4f4313beb1e47e6907c (diff) | |
| download | Git-Auto-Deploy-origin/development.zip Git-Auto-Deploy-origin/development.tar.gz Git-Auto-Deploy-origin/development.tar.bz2 | |
Merge branch 'xohozu-master' into developmentorigin/development
Diffstat (limited to 'gitautodeploy/httpserver.py')
| -rw-r--r-- | gitautodeploy/httpserver.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gitautodeploy/httpserver.py b/gitautodeploy/httpserver.py index d9310d1..ffd6092 100644 --- a/gitautodeploy/httpserver.py +++ b/gitautodeploy/httpserver.py @@ -128,8 +128,12 @@ class WebhookRequestHandler(BaseHTTPRequestHandler): user_agent = 'user-agent' in request_headers and request_headers['user-agent'] content_type = 'content-type' in request_headers and request_headers['content-type'] + # Assume Coding if the X-Coding-Event HTTP header is set + if 'x-coding-event' in request_headers: + return parsers.CodingRequestParser + # Assume GitLab if the X-Gitlab-Event HTTP header is set - if 'x-gitlab-event' in request_headers: + elif 'x-gitlab-event' in request_headers: # Special Case for Gitlab CI if content_type == "application/json" and "build_status" in data: |