From 1e8db7d7815b88bd8f8b0de5879d2baaf2e47060 Mon Sep 17 00:00:00 2001
From: Arturo Herrero <arturo.herrero@gmail.com>
Date: Thu, 15 Apr 2021 13:06:39 +0100
Subject: [PATCH] Fix Jenkins integration for GitLab FOSS

We moved Jenkins integration from EE to Core in 13.7
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37797 but we
haven't moved the Rails strong parameters jenkins_url and project_name
causing the validation to fail for GitLab FOSS.
---
 app/controllers/concerns/service_params.rb       | 2 ++
 changelogs/unreleased/300121-fix-jenkins-ce.yml  | 5 +++++
 ee/app/controllers/concerns/ee/service_params.rb | 2 --
 3 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 changelogs/unreleased/300121-fix-jenkins-ce.yml

diff --git a/app/controllers/concerns/service_params.rb b/app/controllers/concerns/service_params.rb
index 6262d29a734dafed..7c57d321c807c1c3 100644
--- a/app/controllers/concerns/service_params.rb
+++ b/app/controllers/concerns/service_params.rb
@@ -44,6 +44,7 @@ module ServiceParams
     # make those event names plural as special case.
     :issues_events,
     :issues_url,
+    :jenkins_url,
     :jira_issue_transition_automatic,
     :jira_issue_transition_id,
     :manual_configuration,
@@ -56,6 +57,7 @@ module ServiceParams
     :password,
     :priority,
     :project_key,
+    :project_name,
     :project_url,
     :recipients,
     :restrict_to_branch,
diff --git a/changelogs/unreleased/300121-fix-jenkins-ce.yml b/changelogs/unreleased/300121-fix-jenkins-ce.yml
new file mode 100644
index 0000000000000000..03a7efce5fbe9a12
--- /dev/null
+++ b/changelogs/unreleased/300121-fix-jenkins-ce.yml
@@ -0,0 +1,5 @@
+---
+title: Fix Jenkins integration for GitLab FOSS
+merge_request: 59476
+author:
+type: fixed
diff --git a/ee/app/controllers/concerns/ee/service_params.rb b/ee/app/controllers/concerns/ee/service_params.rb
index a358fa6e7cd965fd..879ce835e721ba72 100644
--- a/ee/app/controllers/concerns/ee/service_params.rb
+++ b/ee/app/controllers/concerns/ee/service_params.rb
@@ -6,10 +6,8 @@ module ServiceParams
 
     ALLOWED_PARAMS_EE = [
       :issues_enabled,
-      :jenkins_url,
       :multiproject_enabled,
       :pass_unstable,
-      :project_name,
       :repository_url,
       :static_context,
       :vulnerabilities_enabled,
-- 
GitLab