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
921141ae
Commit
921141ae
authored
Feb 01, 2017
by
Grzegorz Bizon
Committed by
Filipa Lacerda
Feb 03, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Serialize pipelines in the new merge request action
parent
45966b0a
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
1 deletion
+8
-1
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+8
-1
No files found.
app/controllers/projects/merge_requests_controller.rb
View file @
921141ae
...
...
@@ -224,7 +224,14 @@ class Projects::MergeRequestsController < Projects::ApplicationController
end
def
new
define_new_vars
respond_to
do
|
format
|
format
.
html
{
define_new_vars
}
format
.
json
do
render
json:
{
pipelines:
PipelineSerializer
.
new
(
project:
@project
,
user:
@current_user
)
.
represent
(
@pipelines
)
}
end
end
end
def
new_diffs
...
...
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