From d831597cc27efde34c009054a4b218d376648382 Mon Sep 17 00:00:00 2001 From: Sven Fuchs Date: Sun, 5 Jul 2015 19:57:47 +0200 Subject: [PATCH 1/5] ignore invalidated repos --- lib/travis/api/v3/queries/repository.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/travis/api/v3/queries/repository.rb b/lib/travis/api/v3/queries/repository.rb index dfc9ed99..a05d1c5b 100644 --- a/lib/travis/api/v3/queries/repository.rb +++ b/lib/travis/api/v3/queries/repository.rb @@ -12,7 +12,7 @@ module Travis::API::V3 def by_slug owner_name, name = slug.split('/') - Models::Repository.where(owner_name: owner_name, name: name).first + Models::Repository.where(owner_name: owner_name, name: name, invalidated_at: nil).first end end end From 162a40ca80983a008e2dd8759bc6d7e2410145ed Mon Sep 17 00:00:00 2001 From: Sven Fuchs Date: Sun, 12 Jul 2015 18:29:25 +0200 Subject: [PATCH 2/5] use core/sf-repos_invalidated_at --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 9334227c..f76cb6c1 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ ruby '2.1.6' if ENV.key?('DYNO') gem 's3', github: 'travis-ci/s3' -gem 'travis-core', github: 'travis-ci/travis-core' +gem 'travis-core', github: 'travis-ci/travis-core', ref: 'sf-repos_invalidated_at' gem 'travis-support', github: 'travis-ci/travis-support' gem 'travis-config', '~> 0.1.0' gem 'travis-sidekiqs', github: 'travis-ci/travis-sidekiqs', require: nil From ba61986e1d92357b7c7ed99a7fe2a06db8e6beef Mon Sep 17 00:00:00 2001 From: Sven Fuchs Date: Mon, 13 Jul 2015 14:06:30 +0200 Subject: [PATCH 3/5] use travis-core/master --- Gemfile | 2 +- Gemfile.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index f76cb6c1..9334227c 100644 --- a/Gemfile +++ b/Gemfile @@ -5,7 +5,7 @@ ruby '2.1.6' if ENV.key?('DYNO') gem 's3', github: 'travis-ci/s3' -gem 'travis-core', github: 'travis-ci/travis-core', ref: 'sf-repos_invalidated_at' +gem 'travis-core', github: 'travis-ci/travis-core' gem 'travis-support', github: 'travis-ci/travis-support' gem 'travis-config', '~> 0.1.0' gem 'travis-sidekiqs', github: 'travis-ci/travis-sidekiqs', require: nil diff --git a/Gemfile.lock b/Gemfile.lock index 982fce5f..cebbe0e3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -50,7 +50,7 @@ GIT GIT remote: git://github.com/travis-ci/travis-core.git - revision: 3bf0ef70894375578a9af55e0eb9566eb9424294 + revision: 76d7a2fbcc63e98c60bc139322ac5ae7890bf038 specs: travis-core (0.0.1) actionmailer (~> 3.2.19) From 426a4f3a6903610590ea1a6ef305d851af0d32e9 Mon Sep 17 00:00:00 2001 From: Sven Fuchs Date: Mon, 13 Jul 2015 14:10:47 +0200 Subject: [PATCH 4/5] ignore invalidated repos on the Repositories query --- lib/travis/api/v3/queries/repositories.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/travis/api/v3/queries/repositories.rb b/lib/travis/api/v3/queries/repositories.rb index c5b08e9b..1a683ffc 100644 --- a/lib/travis/api/v3/queries/repositories.rb +++ b/lib/travis/api/v3/queries/repositories.rb @@ -3,7 +3,7 @@ module Travis::API::V3 params :active, :private, prefix: :repository def for_member(user) - all.joins(:users).where(users: user_condition(user)) + all.joins(:users).where(users: user_condition(user), invalidated_at: nil) end def for_owner(owner) @@ -15,6 +15,7 @@ module Travis::API::V3 end def filter(list) + list = list.where(invalidated_at: nil) list = list.where(active: bool(active)) unless active.nil? list = list.where(private: bool(private)) unless private.nil? list = list.includes(:owner) if includes? 'repository.owner'.freeze From 9ed6cb636d0049affceb125cbd1886c766a76bef Mon Sep 17 00:00:00 2001 From: Sven Fuchs Date: Tue, 14 Jul 2015 14:36:35 +0200 Subject: [PATCH 5/5] bump travis-core --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index cebbe0e3..982fce5f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -50,7 +50,7 @@ GIT GIT remote: git://github.com/travis-ci/travis-core.git - revision: 76d7a2fbcc63e98c60bc139322ac5ae7890bf038 + revision: 3bf0ef70894375578a9af55e0eb9566eb9424294 specs: travis-core (0.0.1) actionmailer (~> 3.2.19)