summaryrefslogtreecommitdiff
path: root/app/models/hooks
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-09-24 00:14:11 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2022-09-24 00:14:11 +0000
commitf70958a8932f70733e08ee1774edd28423bac59e (patch)
tree255c18df6d34de3972d4b53f1916fab05fb6f228 /app/models/hooks
parent0978fc4c40151a0dccbcb3d348969a6920a58e09 (diff)
downloadgitlab-ce-f70958a8932f70733e08ee1774edd28423bac59e.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/hooks')
-rw-r--r--app/models/hooks/service_hook.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/hooks/service_hook.rb b/app/models/hooks/service_hook.rb
index 80e167b350b..27119d3a95a 100644
--- a/app/models/hooks/service_hook.rb
+++ b/app/models/hooks/service_hook.rb
@@ -4,7 +4,7 @@ class ServiceHook < WebHook
include Presentable
extend ::Gitlab::Utils::Override
- belongs_to :integration, foreign_key: :service_id
+ belongs_to :integration
validates :integration, presence: true
def execute(data, hook_name = 'service_hook')