summaryrefslogtreecommitdiff
path: root/app/services
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2019-04-23 12:05:17 +0000
committerRémy Coutable <remy@rymai.me>2019-04-23 12:05:17 +0000
commitd369d6924076547327b6d2200762b5cb40b57e31 (patch)
treed2b090d54f7a62092fa29a9df87de271ea67e76f /app/services
parentdcb23df2f0194ab264d57cdc0b7c8ff1cc9c0e99 (diff)
parent97cd3e8c5ac3f96169b9b82e78b90f54ca1fcb22 (diff)
downloadgitlab-ce-d369d6924076547327b6d2200762b5cb40b57e31.tar.gz
Merge branch 'upgrade-to-rails-5-1' into 'master'
Upgrade Rails to 5.1 See merge request gitlab-org/gitlab-ce!27480
Diffstat (limited to 'app/services')
-rw-r--r--app/services/projects/propagate_service_template.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/projects/propagate_service_template.rb b/app/services/projects/propagate_service_template.rb
index 633a263af7b..a2f36d2bd1b 100644
--- a/app/services/projects/propagate_service_template.rb
+++ b/app/services/projects/propagate_service_template.rb
@@ -80,7 +80,7 @@ module Projects
value = value.is_a?(Hash) ? value.to_json : value
service_hash[ActiveRecord::Base.connection.quote_column_name(key)] =
- ActiveRecord::Base.sanitize(value)
+ ActiveRecord::Base.connection.quote(value)
end
end
end