Commit 1e8db7d7 authored by Arturo Herrero's avatar Arturo Herrero

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.
parent 8edb8cb8
...@@ -44,6 +44,7 @@ module ServiceParams ...@@ -44,6 +44,7 @@ module ServiceParams
# make those event names plural as special case. # make those event names plural as special case.
:issues_events, :issues_events,
:issues_url, :issues_url,
:jenkins_url,
:jira_issue_transition_automatic, :jira_issue_transition_automatic,
:jira_issue_transition_id, :jira_issue_transition_id,
:manual_configuration, :manual_configuration,
...@@ -56,6 +57,7 @@ module ServiceParams ...@@ -56,6 +57,7 @@ module ServiceParams
:password, :password,
:priority, :priority,
:project_key, :project_key,
:project_name,
:project_url, :project_url,
:recipients, :recipients,
:restrict_to_branch, :restrict_to_branch,
......
---
title: Fix Jenkins integration for GitLab FOSS
merge_request: 59476
author:
type: fixed
...@@ -6,10 +6,8 @@ module EE ...@@ -6,10 +6,8 @@ module EE
ALLOWED_PARAMS_EE = [ ALLOWED_PARAMS_EE = [
:issues_enabled, :issues_enabled,
:jenkins_url,
:multiproject_enabled, :multiproject_enabled,
:pass_unstable, :pass_unstable,
:project_name,
:repository_url, :repository_url,
:static_context, :static_context,
:vulnerabilities_enabled, :vulnerabilities_enabled,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment