summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2015-10-23 11:41:50 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2015-10-23 16:25:23 +0200
commit74c02827bc2ee72ca0dc84da156b9133e01d3693 (patch)
tree2eadf01f19fc25c800e96d14e57991d5a372a067
parent6b7d01d9ff1846350e43a9ca7f42fe0a613a2b9d (diff)
downloadgitlab-ce-74c02827bc2ee72ca0dc84da156b9133e01d3693.tar.gz
On CI Admin page show only projects that are present in GitLab
-rw-r--r--app/models/ci/project.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/ci/project.rb b/app/models/ci/project.rb
index eb65c773570..4e806ca1a68 100644
--- a/app/models/ci/project.rb
+++ b/app/models/ci/project.rb
@@ -99,6 +99,7 @@ module Ci
def ordered_by_last_commit_date
last_commit_subquery = "(SELECT gl_project_id, MAX(committed_at) committed_at FROM #{Ci::Commit.table_name} GROUP BY gl_project_id)"
joins("LEFT JOIN #{last_commit_subquery} AS last_commit ON #{Ci::Project.table_name}.gitlab_id = last_commit.gl_project_id").
+ joins(:gl_project).
order("CASE WHEN last_commit.committed_at IS NULL THEN 1 ELSE 0 END, last_commit.committed_at DESC")
end
end