Fix 404 errors on Merge Request -> new

Dmitriy Zaporozhets
1 parent b6fc0310
Showing 3 changed files with 7 additions and 3 deletions Show diff stats
app/helpers/commits_helper.rb
app/views/merge_requests/branch_from.js.haml
app/views/merge_requests/branch_to.js.haml
@@ -65,4 +65,9 @@ module CommitsHelper
     end
   end
  
+  def commit_to_html commit
+    if commit.model
+      escape_javascript(render 'commits/commit', commit: commit)
+    end
+  end
 end
 :plain
-  $(".mr_source_commit").html("#{escape_javascript(render 'commits/commit', commit: @commit)}");
+  $(".mr_source_commit").html("#{commit_to_html(@commit)}");
 :plain
-  $(".mr_target_commit").html("#{escape_javascript(render 'commits/commit', commit: @commit)}");
-
+  $(".mr_target_commit").html("#{commit_to_html(@commit)}");
...	...	@@ -65,4 +65,9 @@ module CommitsHelper
65	65	end
66	66	end
67	67
	68	+ def commit_to_html commit
	69	+ if commit.model
	70	+ escape_javascript(render 'commits/commit', commit: commit)
	71	+ end
	72	+ end
68	73	end
...	...
1	1	:plain
2		- $(".mr_source_commit").html("#{escape_javascript(render 'commits/commit', commit: @commit)}");
	2	+ $(".mr_source_commit").html("#{commit_to_html(@commit)}");
...	...
1	1	:plain
2		- $(".mr_target_commit").html("#{escape_javascript(render 'commits/commit', commit: @commit)}");
3		-
	2	+ $(".mr_target_commit").html("#{commit_to_html(@commit)}");
...	...