Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
c94cff3e
Commit
c94cff3e
authored
Jul 12, 2016
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Prefer if over return
parent
6597c213
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
5 deletions
+9
-5
app/models/project.rb
app/models/project.rb
+9
-5
No files found.
app/models/project.rb
View file @
c94cff3e
...
@@ -431,13 +431,17 @@ class Project < ActiveRecord::Base
...
@@ -431,13 +431,17 @@ class Project < ActiveRecord::Base
def
builds_for
(
build_name
,
ref
=
'HEAD'
)
def
builds_for
(
build_name
,
ref
=
'HEAD'
)
ct
=
commit
(
ref
)
ct
=
commit
(
ref
)
return
builds
.
none
unless
ct
sha
=
commit
(
ref
).
sha
if
ct
.
nil?
builds
.
none
builds
.
joins
(
:pipeline
).
else
merge
(
Ci
::
Pipeline
.
where
(
sha:
sha
)).
sha
=
ct
.
sha
where
(
name:
build_name
)
builds
.
joins
(
:pipeline
).
merge
(
Ci
::
Pipeline
.
where
(
sha:
sha
)).
where
(
name:
build_name
)
end
end
end
def
merge_base_commit
(
first_commit_id
,
second_commit_id
)
def
merge_base_commit
(
first_commit_id
,
second_commit_id
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment