summaryrefslogtreecommitdiff
path: root/lib/ci/charts.rb
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2017-08-09 15:57:52 -0700
committerStan Hu <stanhu@gmail.com>2017-08-09 15:57:52 -0700
commit09baadca349670822645b56a17e9bf8716e997b6 (patch)
tree397bb26f3a0e851b39c57351cbe6963adc47dea8 /lib/ci/charts.rb
parentded77e21b38dbb65aec2aeae42de02e6571fe01a (diff)
parent2925850ceec3ef89eb1f60b0a648dbc5f72d8683 (diff)
downloadgitlab-ce-09baadca349670822645b56a17e9bf8716e997b6.tar.gz
Merge branch 'master' into sh-headless-chrome-support
Diffstat (limited to 'lib/ci/charts.rb')
-rw-r--r--lib/ci/charts.rb2
1 files changed, 1 insertions, 1 deletions
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)