Commit 6e2536cd authored by Stan Hu's avatar Stan Hu

Merge branch 'fix-missing-ee-options' into 'master'

Fix missing EE-specific service parameters for Jenkins CI

This fixes configuring Jenkins CI.

These lines seem to be omitted in 8.11 altogether with no git history:

https://gitlab.com/gitlab-org/gitlab-ee/blob/v8.10.7-ee/app/controllers/concerns/service_params.rb#L17-19

When I look at all the commits in the history, I see no sign that these EE parameters disappeared:

https://gitlab.com/gitlab-org/gitlab-ee/commits/master/app/controllers/concerns/service_params.rb

Closes gitlab-com/support-forum#946, #934

See merge request !692
parents c6aebae7 aaf02070
......@@ -3,6 +3,7 @@ v 8.12.0 (Unreleased)
v 8.11.3 (Unreleased)
- [ES] Add logging to indexer
- Fix missing EE-specific service parameters for Jenkins CI
- Set the correct `GL_PROTOCOL` when rebasing !691
- [ES] Elasticsearch workers checks ES settings before running
......
......@@ -18,7 +18,11 @@ module ServiceParams
:add_pusher, :send_from_committer_email, :disable_diffs,
:external_wiki_url, :notify, :color,
:server_host, :server_port, :default_irc_uri, :enable_ssl_verification,
:jira_issue_transition_id]
:jira_issue_transition_id,
## EE Specific
:multiproject_enabled, :pass_unstable,
:jenkins_url, :project_name]
# Parameters to ignore if no value is specified
FILTER_BLANK_PARAMS = [:password]
......
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