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
0f051a2fad02
Commit
7ef156a2
authored
Oct 12, 2015
by
Kamil Trzcinski
Browse files
Add author to statuses
parent
47d9b956d7f3
Changes
4
Hide whitespace changes
Inline
Side-by-side
app/models/commit_status.rb
View file @
0f051a2f
...
...
@@ -9,6 +9,8 @@ class CommitStatus < ActiveRecord::Base
validates_presence_of
:name
alias_attribute
:author
,
:user
scope
:running
,
->
()
{
where
(
status:
'running'
)
}
scope
:pending
,
->
()
{
where
(
status:
'pending'
)
}
scope
:success
,
->
()
{
where
(
status:
'success'
)
}
...
...
lib/api/commit_statuses.rb
View file @
0f051a2f
...
...
@@ -52,7 +52,7 @@ class CommitStatus < Grape::API
name
=
params
[
:name
]
||
params
[
:context
]
status
=
GenericCommitStatus
.
running_or_pending
.
find_by
(
commit:
ci_commit
,
name:
name
,
ref:
params
[
:ref
])
status
=
GenericCommitStatus
.
new
(
commit:
ci_commit
)
unless
status
status
=
GenericCommitStatus
.
new
(
commit:
ci_commit
,
user:
current_user
)
unless
status
status
.
update
(
attrs
)
case
params
[
:state
].
to_s
...
...
lib/api/entities.rb
View file @
0f051a2f
...
...
@@ -232,6 +232,7 @@ class CommitNote < Grape::Entity
class
CommitStatus
<
Grape
::
Entity
expose
:id
,
:sha
,
:ref
,
:status
,
:name
,
:target_url
,
:description
,
:created_at
,
:started_at
,
:finished_at
expose
:author
,
using:
Entities
::
UserBasic
end
class
Event
<
Grape
::
Entity
...
...
spec/models/commit_status_spec.rb
View file @
0f051a2f
...
...
@@ -18,6 +18,13 @@
it
{
is_expected
.
to
respond_to
:running?
}
it
{
is_expected
.
to
respond_to
:pending?
}
describe
:author
do
subject
{
commit_status
.
author
}
before
{
commit_status
.
author
=
User
.
new
}
it
{
is_expected
.
to
eq
(
commit_status
.
user
)
}
end
describe
:started?
do
subject
{
commit_status
.
started?
}
...
...
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