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
Tatuya Kamada
gitlab-ce
Commits
f8d6e81b
Commit
f8d6e81b
authored
Mar 07, 2017
by
Shinya Maeda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix rubocop anger
parent
61729204
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
14 deletions
+14
-14
app/serializers/build_serializer.rb
app/serializers/build_serializer.rb
+1
-1
app/serializers/pipeline_serializer.rb
app/serializers/pipeline_serializer.rb
+1
-1
spec/controllers/projects/builds_controller_spec.rb
spec/controllers/projects/builds_controller_spec.rb
+3
-3
spec/controllers/projects/merge_requests_controller_spec.rb
spec/controllers/projects/merge_requests_controller_spec.rb
+6
-6
spec/controllers/projects/pipelines_controller_spec.rb
spec/controllers/projects/pipelines_controller_spec.rb
+3
-3
No files found.
app/serializers/build_serializer.rb
View file @
f8d6e81b
...
...
@@ -2,7 +2,7 @@ class BuildSerializer < BaseSerializer
entity
BuildEntity
def
with_status
tap
{
@status_only
=
{
only:
[{
details:
[
:status
]}]
}
}
tap
{
@status_only
=
{
only:
[{
details:
[
:status
]
}]
}
}
end
def
represent
(
resource
,
opts
=
{})
...
...
app/serializers/pipeline_serializer.rb
View file @
f8d6e81b
...
...
@@ -12,7 +12,7 @@ class PipelineSerializer < BaseSerializer
end
def
with_status
tap
{
@status_only
=
{
only:
[{
details:
[
:status
]}]
}
}
tap
{
@status_only
=
{
only:
[{
details:
[
:status
]
}]
}
}
end
def
represent
(
resource
,
opts
=
{})
...
...
spec/controllers/projects/builds_controller_spec.rb
View file @
f8d6e81b
...
...
@@ -16,9 +16,9 @@ describe Projects::BuildsController do
pipeline
=
create
(
:ci_pipeline
,
project:
project
)
build
=
create
(
:ci_build
,
pipeline:
pipeline
,
status:
'success'
)
get
:status
,
namespace_id:
project
.
namespace
,
project_id:
project
,
id:
build
.
id
,
format: :json
project_id:
project
,
id:
build
.
id
,
format: :json
end
it
'returns pipeline status via BuildSerializer'
do
...
...
spec/controllers/projects/merge_requests_controller_spec.rb
View file @
f8d6e81b
...
...
@@ -1183,13 +1183,13 @@ describe Projects::MergeRequestsController do
context
'when accessing status'
do
before
do
create
(
:ci_pipeline
,
project:
merge_request
.
source_project
,
ref:
merge_request
.
source_branch
,
sha:
merge_request
.
diff_head_sha
,
status:
'success'
)
ref:
merge_request
.
source_branch
,
sha:
merge_request
.
diff_head_sha
,
status:
'success'
)
get
:status
,
namespace_id:
project
.
namespace
,
project_id:
project
,
id:
merge_request
.
iid
,
format: :json
project_id:
project
,
id:
merge_request
.
iid
,
format: :json
end
it
'returns pipeline status via PipelineSerializer'
do
...
...
spec/controllers/projects/pipelines_controller_spec.rb
View file @
f8d6e81b
...
...
@@ -75,9 +75,9 @@ describe Projects::PipelinesController do
before
do
pipeline
=
create
(
:ci_pipeline
,
project:
project
,
status:
'success'
)
get
:status
,
namespace_id:
project
.
namespace
,
project_id:
project
,
id:
pipeline
.
id
,
format: :json
project_id:
project
,
id:
pipeline
.
id
,
format: :json
end
it
'returns pipeline status via PipelineSerializer'
do
...
...
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