From daff64452ff79b95eda5eb33c5aea8aface98f2b Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Thu, 22 Dec 2016 14:02:45 +0100
Subject: Do not show retried builds in pipeline stage dropdown

---
 app/views/projects/pipelines/_stage.html.haml      |  2 +-
 .../projects/pipelines/_stage.html.haml_spec.rb    | 44 +++++++++++++++++++---
 2 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/app/views/projects/pipelines/_stage.html.haml b/app/views/projects/pipelines/_stage.html.haml
index 20456e792e7..cf1b366bf2c 100644
--- a/app/views/projects/pipelines/_stage.html.haml
+++ b/app/views/projects/pipelines/_stage.html.haml
@@ -1,4 +1,4 @@
 %ul
-  - @stage.statuses.each do |status|
+  - @stage.statuses.latest.each do |status|
     %li.dropdown-build
       = render 'ci/status/graph_badge', subject: status
diff --git a/spec/views/projects/pipelines/_stage.html.haml_spec.rb b/spec/views/projects/pipelines/_stage.html.haml_spec.rb
index eb7f7ca4a1a..d25de8af5d2 100644
--- a/spec/views/projects/pipelines/_stage.html.haml_spec.rb
+++ b/spec/views/projects/pipelines/_stage.html.haml_spec.rb
@@ -7,15 +7,47 @@ describe 'projects/pipelines/_stage', :view do
 
   before do
     assign :stage, stage
+  end
+
+  context 'when there are only latest builds present' do
+    before do
+      create(:ci_build, name: 'test:build',
+                        stage: stage.name,
+                        pipeline: pipeline)
+    end
+
+    it 'shows the builds in the stage' do
+      render
+
+      expect(rendered).to have_text 'test:build'
+    end
+  end
+
+  context 'when build belongs to different stage' do
+    before do
+      create(:ci_build, name: 'test:build',
+                        stage: 'other:stage',
+                        pipeline: pipeline)
+    end
 
-    create(:ci_build, name: 'test:build',
-                      stage: stage.name,
-                      pipeline: pipeline)
+    it 'does not render build' do
+      render
+
+      expect(rendered).not_to have_text 'test:build'
+    end
   end
 
-  it 'shows the builds in the stage' do
-    render
+  context 'when there are retried builds present' do
+    before do
+      create_list(:ci_build, 2, name: 'test:build',
+                                stage: stage.name,
+                                pipeline: pipeline)
+    end
+
+    it 'shows only latest builds' do
+      render
 
-    expect(rendered).to have_text 'test:build'
+      expect(rendered).to have_text 'test:build', count: 1
+    end
   end
 end
-- 
cgit v1.2.3


From 3f9095722c0d78524e9e9bd4b3c343ace3d09f31 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Thu, 22 Dec 2016 14:09:46 +0100
Subject: Add Changelog entry for pipeline stage dropdown fix

---
 .../unreleased/fix-hide-retried-builds-in-pipeline-stage-dropdown.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 changelogs/unreleased/fix-hide-retried-builds-in-pipeline-stage-dropdown.yml

diff --git a/changelogs/unreleased/fix-hide-retried-builds-in-pipeline-stage-dropdown.yml b/changelogs/unreleased/fix-hide-retried-builds-in-pipeline-stage-dropdown.yml
new file mode 100644
index 00000000000..66256d7ed0e
--- /dev/null
+++ b/changelogs/unreleased/fix-hide-retried-builds-in-pipeline-stage-dropdown.yml
@@ -0,0 +1,4 @@
+---
+title: Do not show retried builds in pipeline stage dropdown
+merge_request: 8260
+author:
-- 
cgit v1.2.3