summaryrefslogtreecommitdiff
path: root/lib/ci
diff options
context:
space:
mode:
authorBrian Neel <brian@gitlab.com>2017-08-03 22:20:34 -0400
committerBrian Neel <brian@gitlab.com>2017-08-08 10:50:54 -0400
commit9770c57fab0315865a33c8b6df269eded0d57b5c (patch)
tree5a7c7a9fccbce5ef3ccf6b02b1297aace41101fd /lib/ci
parentb612a47da0e0225332a59ab961206f84602ad629 (diff)
downloadgitlab-ce-9770c57fab0315865a33c8b6df269eded0d57b5c.tar.gz
Re-enable SqlInjection and CommandInjection
Diffstat (limited to 'lib/ci')
-rw-r--r--lib/ci/ansi2html.rb4
-rw-r--r--lib/ci/charts.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/ci/ansi2html.rb b/lib/ci/ansi2html.rb
index 55402101e43..8354fc8d595 100644
--- a/lib/ci/ansi2html.rb
+++ b/lib/ci/ansi2html.rb
@@ -254,7 +254,7 @@ module Ci
def state
state = STATE_PARAMS.inject({}) do |h, param|
- h[param] = send(param)
+ h[param] = send(param) # rubocop:disable GitlabSecurity/PublicSend
h
end
Base64.urlsafe_encode64(state.to_json)
@@ -266,7 +266,7 @@ module Ci
return if state[:offset].to_i > stream.size
STATE_PARAMS.each do |param|
- send("#{param}=".to_sym, state[param])
+ send("#{param}=".to_sym, state[param]) # rubocop:disable GitlabSecurity/PublicSend
end
end
diff --git a/lib/ci/charts.rb b/lib/ci/charts.rb
index 872e418c788..76a69bf8a83 100644
--- a/lib/ci/charts.rb
+++ b/lib/ci/charts.rb
@@ -47,7 +47,7 @@ module Ci
def collect
query = project.pipelines
- .where("? > #{Ci::Pipeline.table_name}.created_at AND #{Ci::Pipeline.table_name}.created_at > ?", @to, @from)
+ .where("? > #{Ci::Pipeline.table_name}.created_at AND #{Ci::Pipeline.table_name}.created_at > ?", @to, @from) # rubocop:disable GitlabSecurity/SqlInjection
totals_count = grouped_count(query)
success_count = grouped_count(query.success)