diff options
| -rw-r--r-- | app/models/ci/build.rb | 6 |
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) } |