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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
d7721635
Commit
d7721635
authored
Jul 29, 2016
by
Sean McGivern
Committed by
Fatih Acet
Aug 12, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix commit tab initial load
parent
28ef06c5
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
1 deletion
+5
-1
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+5
-1
No files found.
app/controllers/projects/merge_requests_controller.rb
View file @
d7721635
...
@@ -134,7 +134,11 @@ class Projects::MergeRequestsController < Projects::ApplicationController
...
@@ -134,7 +134,11 @@ class Projects::MergeRequestsController < Projects::ApplicationController
return
render_404
unless
@merge_request
.
cannot_be_merged?
return
render_404
unless
@merge_request
.
cannot_be_merged?
respond_to
do
|
format
|
respond_to
do
|
format
|
format
.
html
{
render
'show'
}
format
.
html
do
define_discussion_vars
render
'show'
end
format
.
json
{
render
json:
Gitlab
::
Conflict
::
FileCollection
.
new
(
@merge_request
)
}
format
.
json
{
render
json:
Gitlab
::
Conflict
::
FileCollection
.
new
(
@merge_request
)
}
end
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