Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
244ac521a64d
Commit
244ac521
authored
Jan 28, 2016
by
Douwe Maan
Browse files
Fix specs
parent
d227aa137e29
Changes
4
Hide whitespace changes
Inline
Side-by-side
app/models/merge_request.rb
View file @
244ac521
...
...
@@ -183,7 +183,7 @@
def
diff_base_commit
if
merge_request_diff
merge_request_diff
.
base_commit
els
e
els
if
source_sha
self
.
target_project
.
merge_base_commit
(
self
.
source_sha
,
self
.
target_branch
)
end
end
...
...
@@ -489,7 +489,7 @@
end
def
source_sha
last_commit
.
sha
last_commit
.
try
(
:
sha
)
end
def
fetch_ref
...
...
app/models/project.rb
View file @
244ac521
...
...
@@ -349,7 +349,8 @@
end
def
merge_base_commit
(
first_commit_id
,
second_commit_id
)
repository
.
commit
(
repository
.
merge_base
(
first_commit_id
,
second_commit_id
))
sha
=
repository
.
merge_base
(
first_commit_id
,
second_commit_id
)
repository
.
commit
(
sha
)
if
sha
end
def
saved?
...
...
app/models/repository.rb
View file @
244ac521
...
...
@@ -589,6 +589,8 @@
def
merge_base
(
first_commit_id
,
second_commit_id
)
rugged
.
merge_base
(
first_commit_id
,
second_commit_id
)
rescue
Rugged
::
ReferenceError
nil
end
def
is_ancestor?
(
ancestor_id
,
descendant_id
)
...
...
spec/models/build_spec.rb
View file @
244ac521
require
'spec_helper'
describe
Ci
::
Build
,
models:
true
do
let
(
:project
)
{
FactoryGirl
.
create
:
empty_
project
}
let
(
:project
)
{
FactoryGirl
.
create
:project
}
let
(
:commit
)
{
FactoryGirl
.
create
:ci_commit
,
project:
project
}
let
(
:build
)
{
FactoryGirl
.
create
:ci_build
,
commit:
commit
}
...
...
Write
Preview
Supports
Markdown
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