summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Stark <stark@gitlab.com>2018-02-09 17:35:51 +0100
committerGreg Stark <stark@gitlab.com>2018-02-09 17:35:51 +0100
commit82f9c1c429af118b6bcedfb60813e1ba741511d1 (patch)
tree004967c783213f0b5c9aba0eb1c7e1806843e0b0
parentd21f41307a531636f5f54c8c3d055cbbf1fa9b21 (diff)
downloadgitlab-ce-82f9c1c429af118b6bcedfb60813e1ba741511d1.tar.gz
add rubocop whitelist
-rw-r--r--app/models/ci/build.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 3321d98e237..836b9699cf5 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -60,7 +60,7 @@ module Ci
new = Ci::Build.select(:id).where(%q[(artifacts_file IS NULL OR artifacts_file = '') AND EXISTS (?)],
Ci::JobArtifact.select(1).where('ci_builds.id = ci_job_artifacts.job_id'))
union = Gitlab::SQL::Union.new([old, new], remove_duplicates: false)
- where(%Q[ci_builds.id IN (#{union.to_sql})])
+ where(%Q[ci_builds.id IN (#{union.to_sql})]) # rubocop:disable GitlabSecurity/SqlInjection
end
scope :with_artifacts_not_expired, ->() do
@@ -68,7 +68,7 @@ module Ci
new = Ci::Build.select(:id).where(%q[(artifacts_file IS NULL OR artifacts_file = '') AND EXISTS (?)],
Ci::JobArtifact.select(1).where('ci_builds.id = ci_job_artifacts.job_id AND (expire_at IS NULL OR expire_at > ?)', Time.now))
union = Gitlab::SQL::Union.new([old, new], remove_duplicates: false)
- where(%Q[ci_builds.id IN (#{union.to_sql})])
+ where(%Q[ci_builds.id IN (#{union.to_sql})]) # rubocop:disable GitlabSecurity/SqlInjection
end
scope :with_expired_artifacts, ->() do
@@ -76,7 +76,7 @@ module Ci
new = Ci::Build.select(:id).where(%q[(artifacts_file IS NULL OR artifacts_file = '') AND EXISTS (?)],
Ci::JobArtifact.select(1).where('ci_builds.id = ci_job_artifacts.job_id AND expire_at < ?', Time.now))
union = Gitlab::SQL::Union.new([old, new], remove_duplicates: false)
- where(%Q[ci_builds.id IN (#{union.to_sql})])
+ where(%Q[ci_builds.id IN (#{union.to_sql})]) # rubocop:disable GitlabSecurity/SqlInjection
end
scope :last_month, ->() { where('created_at > ?', Date.today - 1.month) }