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
Boxiang Sun
gitlab-ce
Commits
f0f7af50
Commit
f0f7af50
authored
Feb 16, 2017
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reinstate new merge request pipelines hash in API
parent
7733f285
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+3
-2
spec/controllers/projects/merge_requests_controller_spec.rb
spec/controllers/projects/merge_requests_controller_spec.rb
+2
-1
No files found.
app/controllers/projects/merge_requests_controller.rb
View file @
f0f7af50
...
...
@@ -245,9 +245,10 @@ class Projects::MergeRequestsController < Projects::ApplicationController
format
.
json
do
define_pipelines_vars
render
json:
PipelineSerializer
render
json:
{
pipelines:
PipelineSerializer
.
new
(
project:
@project
,
user:
@current_user
)
.
represent
(
@pipelines
)
.
represent
(
@pipelines
)
}
end
end
end
...
...
spec/controllers/projects/merge_requests_controller_spec.rb
View file @
f0f7af50
...
...
@@ -43,7 +43,8 @@ describe Projects::MergeRequestsController do
submit_new_merge_request
(
format: :json
)
expect
(
response
).
to
be_ok
expect
(
json_response
).
not_to
be_empty
expect
(
json_response
).
to
have_key
'pipelines'
expect
(
json_response
[
'pipelines'
]).
not_to
be_empty
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