Don't show other actions of the same name

2 files changed, 17 insertions, 1 deletions

diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index 21c0e128b98..58f25b20acf 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -97,7 +97,7 @@ module Ci
     end
 
     def other_actions
-      pipeline.manual_actions.where.not(id: self)
+      pipeline.manual_actions.where.not(name: name)
     end
 
     def playable?
diff --git a/spec/models/build_spec.rb b/spec/models/build_spec.rb
index f9c9725a23d..2de305738cc 100644
--- a/spec/models/build_spec.rb
+++ b/spec/models/build_spec.rb
@@ -808,6 +808,22 @@ describe Ci::Build, models: true do
     it 'returns other actions' do
       is_expected.to contain_exactly(other_build)
     end
+
+    context 'when build is retried' do
+      let!(:new_build) { Ci::Build.retry(build) }
+
+      it 'does not return any of them' do
+        is_expected.not_to include(build, new_build)
+      end
+    end
+
+    context 'when other build is retried' do
+      let!(:retried_build) { Ci::Build.retry(other_build) }
+
+      it 'returns a retried build' do
+        is_expected.to contain_exactly(retried_build)
+      end
+    end
   end
 
   describe '#play' do