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

Dmitriy Zaporozhets
1 parent 890b9f3a
Showing 1 changed file with 3 additions and 3 deletions Show diff stats
app/controllers/merge_requests_controller.rb
@@ -20,9 +20,6 @@ class MergeRequestsController &lt; ProjectResourceController
   end
  
   def show
-    @target_type = :merge_request
-    @target_id = @merge_request.id
-
     respond_to do |format|
       format.html
       format.js
@@ -144,6 +141,9 @@ class MergeRequestsController &lt; ProjectResourceController
  
     @allowed_to_merge = allowed_to_merge?
     @show_merge_controls = @merge_request.opened? && @commits.any? && @allowed_to_merge
+
+    @target_type = :merge_request
+    @target_id = @merge_request.id
   end
  
   def allowed_to_merge?
...	...	@@ -20,9 +20,6 @@ class MergeRequestsController < ProjectResourceController
20	20	end
21	21
22	22	def show
23		- @target_type = :merge_request
24		- @target_id = @merge_request.id
25		-
26	23	respond_to do \|format\|
27	24	format.html
28	25	format.js
...	...	@@ -144,6 +141,9 @@ class MergeRequestsController < ProjectResourceController
144	141
145	142	@allowed_to_merge = allowed_to_merge?
146	143	@show_merge_controls = @merge_request.opened? && @commits.any? && @allowed_to_merge
	144	+
	145	+ @target_type = :merge_request
	146	+ @target_id = @merge_request.id
147	147	end
148	148
149	149	def allowed_to_merge?
...	...