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
diff options
context:
space:
mode:
authorGitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>2023-06-29 11:22:26 +0300
committerGitLab Release Tools Bot <delivery-team+release-tools@gitlab.com>2023-06-29 11:22:26 +0300
commit751cb432aab9837d3174bcdb309fae765925c869 (patch)
tree96b513d6f2fb66af92cf69de69c40487a980e2d4 /app/models/hooks/web_hook.rb
parent7b848eda5589ff5fa1bc3c6f782fc907c59a4417 (diff)
parent9ce736bb2cdbb3e28c522af172d595826f03d516 (diff)
Merge remote-tracking branch 'dev/16-1-stable' into 16-1-stable
Diffstat (limited to 'app/models/hooks/web_hook.rb')
-rw-r--r--app/models/hooks/web_hook.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/hooks/web_hook.rb b/app/models/hooks/web_hook.rb
index 6dc1c9f290a..d7a95363337 100644
--- a/app/models/hooks/web_hook.rb
+++ b/app/models/hooks/web_hook.rb
@@ -135,6 +135,7 @@ class WebHook < ApplicationRecord
return if url_variables_were.blank? || interpolated_url_was == interpolated_url
+ self.url_variables = {} if url_variables_were.keys.intersection(url_variables.keys).any?
self.url_variables = {} if url_changed? && url_variables_were.to_a.intersection(url_variables.to_a).any?
end