Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorValeriy Sizov <vsv2711@gmail.com>2012-08-04 21:17:14 +0400
committerValeriy Sizov <vsv2711@gmail.com>2012-08-04 21:17:14 +0400
commitc7579249024a119b56abcd2978a46a59ea0bb56a (patch)
treeb570983efb6d21980c09227315c24bac9edcf42a /app
parent7dd276817c6459e0fdf6524f1b8e51decd385986 (diff)
parent9912770c6f0177f496112543064355f79badf94b (diff)
Merge pull request #1184 from karuna/master
Hook url should be able to contain http basic authentication
Diffstat (limited to 'app')
-rw-r--r--app/models/web_hook.rb11
1 files changed, 10 insertions, 1 deletions
diff --git a/app/models/web_hook.rb b/app/models/web_hook.rb
index 85d87898682..76efa50198b 100644
--- a/app/models/web_hook.rb
+++ b/app/models/web_hook.rb
@@ -11,7 +11,16 @@ class WebHook < ActiveRecord::Base
message: "should be a valid url" }
def execute(data)
- WebHook.post(url, body: data.to_json, headers: { "Content-Type" => "application/json" })
+ parsed_url = URI.parse(url)
+ if parsed_url.userinfo.blank?
+ WebHook.post(url, body: data.to_json, headers: { "Content-Type" => "application/json" })
+ else
+ post_url = url.gsub(parsed_url.userinfo+"@", "")
+ WebHook.post(post_url,
+ body: data.to_json,
+ headers: { "Content-Type" => "application/json" },
+ basic_auth: {username: parsed_url.user, password: parsed_url.password})
+ end
end
end