Commit d7721635 authored by Sean McGivern's avatar Sean McGivern Committed by Fatih Acet
Browse files

Fix commit tab initial load

parent c54fbe01ce11
......@@ -134,7 +134,11 @@ def conflicts
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% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment