From e44016b90ad900836b2cbc83ebb9f58c39b3576a Mon Sep 17 00:00:00 2001 From: Felipe Artur Date: Thu, 18 May 2017 17:17:58 -0300 Subject: Prevent commits from upstream repositories to be re-processed by forks --- app/workers/process_commit_worker.rb | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'app/workers/process_commit_worker.rb') diff --git a/app/workers/process_commit_worker.rb b/app/workers/process_commit_worker.rb index d6ed0e253ad..8b192aa74c6 100644 --- a/app/workers/process_commit_worker.rb +++ b/app/workers/process_commit_worker.rb @@ -17,6 +17,7 @@ class ProcessCommitWorker project = Project.find_by(id: project_id) return unless project + return if commit_exists_in_upstream?(project, commit_hash) user = User.find_by(id: user_id) @@ -76,4 +77,16 @@ class ProcessCommitWorker Commit.from_hash(hash, project) end + + private + + # Avoid to re-process commits messages that already exists in the upstream + # when project is forked. This will also prevent duplicated system notes. + def commit_exists_in_upstream?(project, commit_hash) + return false unless project.forked? + + upstream_project = project.forked_from_project + commit_id = commit_hash.with_indifferent_access[:id] + upstream_project.commit(commit_id).present? + end end -- cgit v1.2.3