summaryrefslogtreecommitdiff
path: root/app/services/clusters/applications
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-19 09:09:27 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-19 09:09:27 +0000
commit2af90cef2e2e9c776eae4394a43dba3be7f33d1e (patch)
treebb4bc691caa6cc74b45720ecd779517f9c8c2cd3 /app/services/clusters/applications
parentcf58004721ee715dd3884476f6fa0c62a7e7f247 (diff)
downloadgitlab-ce-2af90cef2e2e9c776eae4394a43dba3be7f33d1e.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/clusters/applications')
-rw-r--r--app/services/clusters/applications/base_service.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/services/clusters/applications/base_service.rb b/app/services/clusters/applications/base_service.rb
index a3b39f0994d..bd4ce693085 100644
--- a/app/services/clusters/applications/base_service.rb
+++ b/app/services/clusters/applications/base_service.rb
@@ -31,6 +31,10 @@ module Clusters
application.modsecurity_enabled = params[:modsecurity_enabled] || false
end
+ if application.has_attribute?(:modsecurity_mode)
+ application.modsecurity_mode = params[:modsecurity_mode] || 0
+ end
+
if application.respond_to?(:oauth_application)
application.oauth_application = create_oauth_application(application, request)
end