From 37c68fe025b3b4dd4ac3b510cbb32d42cbe6b23b Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Mon, 14 Mar 2016 11:12:00 +0100
Subject: [PATCH] don't create MR diff as this can be imported presumably

---
 app/models/merge_request.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index de6189b2dc8..d9fbbb85003 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -45,7 +45,7 @@ class MergeRequest < ActiveRecord::Base
 
   serialize :merge_params, Hash
 
-  after_create :create_merge_request_diff
+  after_create :create_merge_request_diff, unless: :importing
   after_update :update_merge_request_diff
 
   delegate :commits, :diffs, :real_size, to: :merge_request_diff, prefix: nil
-- 
GitLab