提交 d7721635 编写于 作者: S Sean McGivern 提交者: Fatih Acet

Fix commit tab initial load

上级 28ef06c5
......@@ -134,7 +134,11 @@ class Projects::MergeRequestsController < Projects::ApplicationController
return render_404 unless @merge_request.cannot_be_merged?
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) }
end
end
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册