diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-10-23 13:37:29 +0000 |
|---|---|---|
| committer | Michael Kozono <mkozono@gmail.com> | 2017-10-24 12:36:25 +0000 |
| commit | 0791a7793c0b48c656f61f3ddcaeb4038df345ce (patch) | |
| tree | 149910592959dd232e1f48480c38e3bcee2adb10 | |
| parent | 39e605c59fa442b352d34d44c53cccad68201d8c (diff) | |
| download | gitlab-ce-0791a7793c0b48c656f61f3ddcaeb4038df345ce.tar.gz | |
Merge branch 'bvl-fix-push-event-service-for-forks' into 'master'
Only cache the push event for the fork-source when it exists
Closes #39352
See merge request gitlab-org/gitlab-ce!14989
(cherry picked from commit 08a8a3f963ff4ca5392abc66eb6fdae5d6d1e118)
6f5ebc4b Only cache the event for the fork-source when it exists
| -rw-r--r-- | app/services/users/last_push_event_service.rb | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/bvl-fix-push-event-service-for-forks.yml | 5 | ||||
| -rw-r--r-- | spec/services/users/last_push_event_service_spec.rb | 1 |
3 files changed, 7 insertions, 3 deletions
diff --git a/app/services/users/last_push_event_service.rb b/app/services/users/last_push_event_service.rb index f2bfb60604f..57e446d7f30 100644 --- a/app/services/users/last_push_event_service.rb +++ b/app/services/users/last_push_event_service.rb @@ -16,8 +16,8 @@ module Users user_cache_key ] - if event.project.forked? - keys << project_cache_key(event.project.forked_from_project) + if forked_from = event.project.forked_from_project + keys << project_cache_key(forked_from) end keys.each { |key| set_key(key, event.id) } diff --git a/changelogs/unreleased/bvl-fix-push-event-service-for-forks.yml b/changelogs/unreleased/bvl-fix-push-event-service-for-forks.yml new file mode 100644 index 00000000000..2a7d80270ac --- /dev/null +++ b/changelogs/unreleased/bvl-fix-push-event-service-for-forks.yml @@ -0,0 +1,5 @@ +--- +title: Only cache last push event for existing projects when pushing to a fork +merge_request: 14989 +author: +type: fixed diff --git a/spec/services/users/last_push_event_service_spec.rb b/spec/services/users/last_push_event_service_spec.rb index 956358738fe..2b6c0267a0f 100644 --- a/spec/services/users/last_push_event_service_spec.rb +++ b/spec/services/users/last_push_event_service_spec.rb @@ -22,7 +22,6 @@ describe Users::LastPushEventService do it 'caches the event for the origin project when pushing to a fork' do source = build(:project, id: 5) - allow(project).to receive(:forked?).and_return(true) allow(project).to receive(:forked_from_project).and_return(source) expect(service).to receive(:set_key) |