summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2016-12-27 15:58:43 -0500
committerRobert Speicher <rspeicher@gmail.com>2016-12-27 15:58:43 -0500
commit3483ae91d64b48d2c47ab6895261b8344423ea7c (patch)
tree622acee4f3b9b2ebacd9c6ef97801220bddd33bf /app
parentffca0da08f22e6b23587ecf0645b44c3c427eddd (diff)
downloadgitlab-ce-3483ae91d64b48d2c47ab6895261b8344423ea7c.tar.gz
Revert "Merge branch 'fix-latest-pipeine-ordering' into 'master' "
This reverts commit bdcdf454be9e26c5e72104b810869aa67e0baf28.
Diffstat (limited to 'app')
-rw-r--r--app/models/ci/pipeline.rb7
-rw-r--r--app/models/project.rb2
2 files changed, 6 insertions, 3 deletions
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index 6894a5763ff..f2f6453b3b9 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -93,8 +93,11 @@ module Ci
.select("max(#{quoted_table_name}.id)")
.group(:ref, :sha)
- relation = ref ? where(ref: ref) : self
- relation.where(id: max_id).order(id: :desc)
+ if ref
+ where(id: max_id, ref: ref)
+ else
+ where(id: max_id)
+ end
end
def self.latest_status(ref = nil)
diff --git a/app/models/project.rb b/app/models/project.rb
index 72fdd4514c4..26fa20f856d 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -418,7 +418,7 @@ class Project < ActiveRecord::Base
repository.commit(ref)
end
- # ref can't be HEAD or SHA, can only be branch/tag name
+ # ref can't be HEAD, can only be branch/tag name or SHA
def latest_successful_builds_for(ref = default_branch)
latest_pipeline = pipelines.latest_successful_for(ref)