Add latest changes from gitlab-org/gitlab@master

3 files changed, 14 insertions, 0 deletions

diff --git a/app/models/hooks/project_hook.rb b/app/models/hooks/project_hook.rb
index 9ae697b9e59..a5f68831f34 100644
--- a/app/models/hooks/project_hook.rb
+++ b/app/models/hooks/project_hook.rb
@@ -2,6 +2,7 @@
 
 class ProjectHook < WebHook
   include TriggerableHooks
+  include Presentable
 
   triggerable_hooks [
     :push_hooks,
diff --git a/app/models/hooks/service_hook.rb b/app/models/hooks/service_hook.rb
index 8f305dd7c22..4caa45a13d4 100644
--- a/app/models/hooks/service_hook.rb
+++ b/app/models/hooks/service_hook.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class ServiceHook < WebHook
+  include Presentable
+
   belongs_to :service
   validates :service, presence: true
 
diff --git a/app/models/hooks/web_hook_log.rb b/app/models/hooks/web_hook_log.rb
index cfb1f3ec63b..df0e7b30f84 100644
--- a/app/models/hooks/web_hook_log.rb
+++ b/app/models/hooks/web_hook_log.rb
@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
 class WebHookLog < ApplicationRecord
+  include SafeUrl
+  include Presentable
+
   belongs_to :web_hook
 
   serialize :request_headers, Hash # rubocop:disable Cop/ActiveRecordSerialize
@@ -9,6 +12,8 @@ class WebHookLog < ApplicationRecord
 
   validates :web_hook, presence: true
 
+  before_save :obfuscate_basic_auth
+
   def self.recent
     where('created_at >= ?', 2.days.ago.beginning_of_day)
       .order(created_at: :desc)
@@ -17,4 +22,10 @@ class WebHookLog < ApplicationRecord
   def success?
     response_status =~ /^2/
   end
+
+  private
+
+  def obfuscate_basic_auth
+    self.url = safe_url
+  end
 end