Fix broken grouping sql clause when rendering commits for CI

17de909a · Kamil Trzcinski · 59058a25 · 17de909a
--- a/app/controllers/ci/projects_controller.rb
+++ b/app/controllers/ci/projects_controller.rb
@@ -14,9 +14,10 @@ class ProjectsController < Ci::ApplicationController
    def show
      @ref = params[:ref]

-      @commits = @project.commits.group(:sha).reverse_order
+      @commits = @project.commits.reverse_order
      if @ref
-        builds = @project.builds.where(ref: @ref).select(:commit_id).distinct
+        # unscope is required, because of default_scope defined in Ci::Build
+        builds = @project.builds.unscope(:select, :order).where(ref: @ref).select(:commit_id).distinct
        @commits = @commits.where(id: builds)
      end
      @commits = @commits.page(params[:page]).per(20)