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
iv
gitlab-ce
Commits
daca1c65
Commit
daca1c65
authored
Oct 12, 2015
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix broken tests
parent
c61dc131
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
7 deletions
+8
-7
app/models/ci/commit.rb
app/models/ci/commit.rb
+2
-2
lib/api/commit_statuses.rb
lib/api/commit_statuses.rb
+1
-1
spec/models/ci/commit_spec.rb
spec/models/ci/commit_spec.rb
+5
-4
No files found.
app/models/ci/commit.rb
View file @
daca1c65
...
@@ -82,7 +82,7 @@ module Ci
...
@@ -82,7 +82,7 @@ module Ci
end
end
def
stage
def
stage
running_or_pending
=
statuses
.
latest
.
running_or_pending
running_or_pending
=
statuses
.
latest
.
running_or_pending
.
ordered
running_or_pending
.
first
.
try
(
:stage
)
running_or_pending
.
first
.
try
(
:stage
)
end
end
...
@@ -189,7 +189,7 @@ module Ci
...
@@ -189,7 +189,7 @@ module Ci
end
end
def
matrix_for_ref?
(
ref
)
def
matrix_for_ref?
(
ref
)
latest_builds
_for_ref
(
ref
).
size
>
1
builds_without_retry
_for_ref
(
ref
).
size
>
1
end
end
def
config_processor
def
config_processor
...
...
lib/api/commit_statuses.rb
View file @
daca1c65
...
@@ -43,7 +43,7 @@ module API
...
@@ -43,7 +43,7 @@ module API
# Examples:
# Examples:
# POST /projects/:id/statuses/:sha
# POST /projects/:id/statuses/:sha
post
':id/statuses/:sha'
do
post
':id/statuses/:sha'
do
authorize!
:create_commit_status
es
,
user_project
authorize!
:create_commit_status
,
user_project
required_attributes!
[
:state
]
required_attributes!
[
:state
]
attrs
=
attributes_for_keys
[
:ref
,
:target_url
,
:description
,
:context
,
:name
]
attrs
=
attributes_for_keys
[
:ref
,
:target_url
,
:description
,
:context
,
:name
]
commit
=
@project
.
commit
(
params
[
:sha
])
commit
=
@project
.
commit
(
params
[
:sha
])
...
...
spec/models/ci/commit_spec.rb
View file @
daca1c65
...
@@ -125,7 +125,7 @@ describe Ci::Commit do
...
@@ -125,7 +125,7 @@ describe Ci::Commit do
end
end
it
'returns all refs'
do
it
'returns all refs'
do
is_expected
.
to
contain_exactly
(
'master'
,
'develop'
)
is_expected
.
to
contain_exactly
(
'master'
,
'develop'
,
nil
)
end
end
end
end
...
@@ -225,9 +225,10 @@ describe Ci::Commit do
...
@@ -225,9 +225,10 @@ describe Ci::Commit do
it
'rebuilds commit'
do
it
'rebuilds commit'
do
expect
(
commit
.
status
).
to
eq
(
'skipped'
)
expect
(
commit
.
status
).
to
eq
(
'skipped'
)
expect
(
create_builds
(
trigger_request
)).
to
be_truthy
expect
(
create_builds
(
trigger_request
)).
to
be_truthy
commit
.
builds
.
reload
expect
(
commit
.
builds
.
size
).
to
eq
(
2
)
# since everything in Ci::Commit is cached we need to fetch a new object
expect
(
commit
.
status
).
to
eq
(
'pending'
)
new_commit
=
Ci
::
Commit
.
find_by_id
(
commit
.
id
)
expect
(
new_commit
.
status
).
to
eq
(
'pending'
)
end
end
end
end
end
end
...
...
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