Fix graphical glitches

fc795d6e · Kamil Trzcinski · e5e6c846 · fc795d6e · fc795d6e · fc795d6e
--- a/app/controllers/ci/projects_controller.rb
+++ b/app/controllers/ci/projects_controller.rb
@@ -14,9 +14,11 @@ class ProjectsController < Ci::ApplicationController
    def show
      @ref = params[:ref]

-      @commits = @project.commits.reverse_order
-      # TODO: this is broken
-      # @commits = @commits.where(ref: @ref) if @ref
+      @commits = @project.commits.group(:sha).reverse_order
+      if @ref
+        builds = @project.builds.where(ref: @ref).select(:commit_id).distinct
+        @commits = @commits.where(id: builds)
+      end
      @commits = @commits.page(params[:page]).per(20)
    end


--- a/app/views/ci/commits/_commit.html.haml
+++ b/app/views/ci/commits/_commit.html.haml
@@ -16,7 +16,8 @@
  %td.build-branch
    - unless @ref
      %span
-        = link_to truncate(commit.last_ref, length: 25), ci_project_path(@project, ref: commit.last_ref)
+        - commit.refs.each do |ref|
+          = link_to truncate(ref, length: 25), ci_project_path(@project, ref: ref)

  %td.duration
    - if commit.duration > 0

--- a/app/views/ci/commits/show.html.haml
+++ b/app/views/ci/commits/show.html.haml
@@ -4,14 +4,22 @@

  .gray-content-block.middle-block
    %pre.commit-message
-      #{@commit.git_commit_message}
+      - if @commit.git_commit_message
+        #{@commit.git_commit_message}
+      - else
+        No commit message

  .gray-content-block.second-block
    .row
      .col-sm-6
-      %p
-        %span.attr-name Commit:
-        #{gitlab_commit_link(@project, @commit.sha)}
+        %p
+          %span.attr-name Commit:
+          #{gitlab_commit_link(@project, @commit.sha)}
+        %p
+          - if @commit.refs.present?
+            %span.attr-name Refs:
+            - @commit.refs.each do |ref|
+              #{gitlab_ref_link(@project, ref)}
      .col-sm-6
        - if @commit.git_author_name || @commit.git_author_email
          %p
@@ -22,10 +30,10 @@
            %span.attr-name Created at:
            #{@commit.created_at.to_s(:short)}

- if current_user && can?(current_user, :manage_builds, gl_project)
-  .pull-right
-    - if @commit.builds.running_or_pending.any?
-      = link_to "Cancel", cancel_ci_project_commits_path(@project, @commit), class: 'btn btn-sm btn-danger'
+        - if current_user && can?(current_user, :manage_builds, gl_project)
+          - if @commit.builds.running_or_pending.any?
+            .pull-right
+              = link_to "Cancel", cancel_ci_project_commits_path(@project, @commit), class: 'btn btn-sm btn-danger'


 - if @commit.yaml_errors.present?
@@ -41,7 +49,7 @@

 - @commit.refs.each do |ref|
  %h3
-    Builds for #{ref}
+    Builds for #{gitlab_ref_link(@project, ref)}
    - if @commit.duration_for_ref(ref) > 0
      %small.pull-right
        %i.fa.fa-time