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
Léo-Paul Géneau
gitlab-ce
Commits
25c1f051
Commit
25c1f051
authored
Feb 07, 2017
by
Grzegorz Bizon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix rendering pipelines for a new merge request
parent
9c916bf5
Changes
2
Show 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
+4
-2
app/views/projects/merge_requests/_new_submit.html.haml
app/views/projects/merge_requests/_new_submit.html.haml
+1
-1
No files found.
app/controllers/projects/merge_requests_controller.rb
View file @
25c1f051
...
@@ -227,9 +227,11 @@ class Projects::MergeRequestsController < Projects::ApplicationController
...
@@ -227,9 +227,11 @@ class Projects::MergeRequestsController < Projects::ApplicationController
respond_to
do
|
format
|
respond_to
do
|
format
|
format
.
html
{
define_new_vars
}
format
.
html
{
define_new_vars
}
format
.
json
do
format
.
json
do
render
json:
{
pipelines:
PipelineSerializer
define_pipelines_vars
render
json:
PipelineSerializer
.
new
(
project:
@project
,
user:
@current_user
)
.
new
(
project:
@project
,
user:
@current_user
)
.
represent
(
@pipelines
)
}
.
represent
(
@pipelines
)
end
end
end
end
end
end
...
...
app/views/projects/merge_requests/_new_submit.html.haml
View file @
25c1f051
...
@@ -46,7 +46,7 @@
...
@@ -46,7 +46,7 @@
-# This tab is always loaded via AJAX
-# This tab is always loaded via AJAX
-
if
@pipelines
.
any?
-
if
@pipelines
.
any?
#pipelines
.pipelines.tab-pane
#pipelines
.pipelines.tab-pane
=
render
"projects/merge_requests/show/pipelines"
,
endpoint:
link_to
(
url_for
(
params
))
=
render
'projects/merge_requests/show/pipelines'
,
endpoint:
request
.
fullpath
.mr-loading-status
.mr-loading-status
=
spinner
=
spinner
...
...
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