From c94cff3e13d3f5ab55816ba2e84f48a659462441 Mon Sep 17 00:00:00 2001
From: Lin Jen-Shin <godfat@godfat.org>
Date: Tue, 12 Jul 2016 19:29:59 +0800
Subject: [PATCH] Prefer if over return
---
app/models/project.rb | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/app/models/project.rb b/app/models/project.rb
index bc15f8c4138..366817079bb 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -431,13 +431,17 @@ class Project < ActiveRecord::Base
def builds_for(build_name, ref = 'HEAD')
ct = commit(ref)
- return builds.none unless ct
- sha = commit(ref).sha
+ if ct.nil?
+ builds.none
- builds.joins(:pipeline).
- merge(Ci::Pipeline.where(sha: sha)).
- where(name: build_name)
+ else
+ sha = ct.sha
+
+ builds.joins(:pipeline).
+ merge(Ci::Pipeline.where(sha: sha)).
+ where(name: build_name)
+ end
end
def merge_base_commit(first_commit_id, second_commit_id)
--
GitLab