Skip to content
Snippets Groups Projects
Commit 3fba2114 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Fix bug MR notes not being loaded when navigate from diff tab

parent 890b9f3a
No related branches found
No related tags found
No related merge requests found
Loading
@@ -20,9 +20,6 @@ class MergeRequestsController < ProjectResourceController
Loading
@@ -20,9 +20,6 @@ class MergeRequestsController < ProjectResourceController
end end
   
def show def show
@target_type = :merge_request
@target_id = @merge_request.id
respond_to do |format| respond_to do |format|
format.html format.html
format.js format.js
Loading
@@ -144,6 +141,9 @@ class MergeRequestsController < ProjectResourceController
Loading
@@ -144,6 +141,9 @@ class MergeRequestsController < ProjectResourceController
   
@allowed_to_merge = allowed_to_merge? @allowed_to_merge = allowed_to_merge?
@show_merge_controls = @merge_request.opened? && @commits.any? && @allowed_to_merge @show_merge_controls = @merge_request.opened? && @commits.any? && @allowed_to_merge
@target_type = :merge_request
@target_id = @merge_request.id
end end
   
def allowed_to_merge? def allowed_to_merge?
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment