diff options
Diffstat (limited to 'lib/gitlab/cache')
| -rw-r--r-- | lib/gitlab/cache/ci/project_pipeline_status.rb | 4 | ||||
| -rw-r--r-- | lib/gitlab/cache/import/caching.rb | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/gitlab/cache/ci/project_pipeline_status.rb b/lib/gitlab/cache/ci/project_pipeline_status.rb index 137f76bc96d..99ce1119c17 100644 --- a/lib/gitlab/cache/ci/project_pipeline_status.rb +++ b/lib/gitlab/cache/ci/project_pipeline_status.rb @@ -69,7 +69,7 @@ module Gitlab self.sha = commit.sha self.status = commit.status - self.ref = project.default_branch + self.ref = project.repository.root_ref end # We only cache the status for the HEAD commit of a project @@ -79,7 +79,7 @@ module Gitlab return unless sha return unless ref - if commit.sha == sha && project.default_branch == ref + if commit.sha == sha && project.repository.root_ref == ref store_in_cache end end diff --git a/lib/gitlab/cache/import/caching.rb b/lib/gitlab/cache/import/caching.rb index 947efee43a9..4dbce0b05e1 100644 --- a/lib/gitlab/cache/import/caching.rb +++ b/lib/gitlab/cache/import/caching.rb @@ -84,8 +84,10 @@ module Gitlab key = cache_key_for(raw_key) Redis::Cache.with do |redis| - redis.incr(key) + value = redis.incr(key) redis.expire(key, timeout) + + value end end |