Fix commit tab initial load

2016-07-29 11:16:31 +01:00 · 2016-07-29 11:16:31 +01:00 · d77216356a
parent 28ef06c52b
commit d77216356a
1 changed files with 5 additions and 1 deletions
--- a/app/controllers/projects/merge_requests_controller.rb
+++ b/app/controllers/projects/merge_requests_controller.rb
@ -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