Make some logic less twistable

6 files changed, 12 insertions, 10 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 5c375fcdb39..4b5564223f4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -52,6 +52,7 @@ v 8.7.0 (unreleased)
   - Hide `Create a group` help block when creating a new project in a group
   - Implement 'TODOs View' as an option for dashboard preferences !3379 (Elias W.)
   - Allow issues and merge requests to be assigned to the author !2765
+  - Make Ci::Commit to group only similar builds and make it stateful (ref, tag) (Kamil Trzciński)
   - Gracefully handle notes on deleted commits in merge requests (Stan Hu)
   - Decouple membership and notifications
   - Fix creation of merge requests for orphaned branches (Stan Hu)
diff --git a/app/models/concerns/statuseable.rb b/app/models/concerns/statuseable.rb
index 7b0c9789fb9..8a293b7b76e 100644
--- a/app/models/concerns/statuseable.rb
+++ b/app/models/concerns/statuseable.rb
@@ -7,7 +7,7 @@ module Statuseable
     def status_sql
       builds = all.select('count(*)').to_sql
       success = all.success.select('count(*)').to_sql
-      ignored = all.ignored.select('count(*)').to_sql if all.try(:ignored)
+      ignored = all.ignored.select('count(*)').to_sql if all.respond_to?(:ignored)
       ignored ||= '0'
       pending = all.pending.select('count(*)').to_sql
       running = all.running.select('count(*)').to_sql
diff --git a/app/views/projects/builds/index.html.haml b/app/views/projects/builds/index.html.haml
index aa85f495e39..0406fc21d77 100644
--- a/app/views/projects/builds/index.html.haml
+++ b/app/views/projects/builds/index.html.haml
@@ -58,6 +58,6 @@
               %th Coverage
             %th
 
-        = render @builds, commit_sha: true, stage: true, allow_retry: true, coverage: @project.build_coverage_enabled?
+        = render @builds, commit_sha: true, ref: true, stage: true, allow_retry: true, coverage: @project.build_coverage_enabled?
 
     = paginate @builds, theme: 'gitlab'
diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml
index 218d396b898..e123eb1cc7a 100644
--- a/app/views/projects/ci/builds/_build.html.haml
+++ b/app/views/projects/ci/builds/_build.html.haml
@@ -19,7 +19,7 @@
     %td
       = link_to build.short_sha, namespace_project_commit_path(build.project.namespace, build.project, build.sha), class: "monospace"
 
-  - if !defined?(ref) || ref
+  - if defined?(ref) && ref
     %td
       - if build.ref
         = link_to build.ref, namespace_project_commits_path(build.project.namespace, build.project, build.ref)
diff --git a/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml b/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
index c15386b4883..f21c864e35c 100644
--- a/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
+++ b/app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml
@@ -15,12 +15,13 @@
   - if defined?(commit_sha) && commit_sha
     %td
       = link_to generic_commit_status.short_sha, namespace_project_commit_path(generic_commit_status.project.namespace, generic_commit_status.project, generic_commit_status.sha), class: "monospace"
-      
-  %td
-    - if generic_commit_status.ref
-      = link_to generic_commit_status.ref, namespace_project_commits_path(generic_commit_status.project.namespace, generic_commit_status.project, generic_commit_status.ref)
-    - else
-      .light none
+
+  - if defined?(ref) && ref
+    %td
+      - if generic_commit_status.ref
+        = link_to generic_commit_status.ref, namespace_project_commits_path(generic_commit_status.project.namespace, generic_commit_status.project, generic_commit_status.ref)
+      - else
+        .light none
 
   - if defined?(runner) && runner
     %td
diff --git a/spec/requests/api/commits_spec.rb b/spec/requests/api/commits_spec.rb
index 25377a40442..e28998d51b5 100644
--- a/spec/requests/api/commits_spec.rb
+++ b/spec/requests/api/commits_spec.rb
@@ -48,7 +48,7 @@ describe API::API, api: true  do
         expect(response.status).to eq(404)
       end
 
-      it "should return not_found for CI status" do
+      it "should return nil for commit without CI" do
         get api("/projects/#{project.id}/repository/commits/#{project.repository.commit.id}", user)
         expect(response.status).to eq(200)
         expect(json_response['status']).to be_nil