diff options
| author | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-05-29 09:58:20 +0200 |
|---|---|---|
| committer | Z.J. van de Weg <git@zjvandeweg.nl> | 2017-05-31 21:56:18 +0200 |
| commit | 8a9a62e3294d92f4e70be6f427c17241a2b7a232 (patch) | |
| tree | 2337d1455c8fb9ebadbe73e872dbdc388a627315 /app/models/ci | |
| parent | 68569584b728ac2dd5100593e9db302f362994f5 (diff) | |
| download | gitlab-ce-8a9a62e3294d92f4e70be6f427c17241a2b7a232.tar.gz | |
Incorporate review
Diffstat (limited to 'app/models/ci')
| -rw-r--r-- | app/models/ci/build.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index b1736f8ef1b..2d49320a631 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -205,13 +205,13 @@ module Ci def merge_request return @merge_request if defined?(@merge_request) - + @merge_request ||= begin merge_requests = MergeRequest.includes(:merge_request_diff) .where(source_branch: ref, source_project: pipeline.project) - .reorder(iid: :asc) + .reorder(iid: :desc) merge_requests.find do |merge_request| merge_request.commits_sha.include?(pipeline.sha) @@ -372,7 +372,7 @@ module Ci end def has_expiring_artifacts? - artifacts_expire_at.present? + artifacts_expire_at.present? && artifacts_expire_at > Time.now end def keep_artifacts! |