diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-02-07 16:56:29 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-02-07 16:56:29 +0000 |
| commit | 1b748440c25619a2aaedef085e6f0aca26ef0d94 (patch) | |
| tree | ad343ebaec9bc236254fc7df2951670c69dc3f2c /app/controllers | |
| parent | bb6895ec6cb60b8db6a615b12628685a088d1f1d (diff) | |
| parent | 0e90284c11815f84c804e7e922e709b31ca6d029 (diff) | |
| download | gitlab-ce-1b748440c25619a2aaedef085e6f0aca26ef0d94.tar.gz | |
Merge branch 'pawel/connect_to_prometheus_through_proxy-30480' into 'master'
Deploy prometheus through kubernetes and autoconnect to cluster
Closes #30480 and #28916
See merge request gitlab-org/gitlab-ce!16182
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/concerns/service_params.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/concerns/service_params.rb b/app/controllers/concerns/service_params.rb index 3d61458c064..c1acb50b76c 100644 --- a/app/controllers/concerns/service_params.rb +++ b/app/controllers/concerns/service_params.rb @@ -32,6 +32,7 @@ module ServiceParams :issues_events, :issues_url, :jira_issue_transition_id, + :manual_configuration, :merge_requests_events, :mock_service_url, :namespace, |