From 82f174217e0515576f2bd53fc836995e5daaa333 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Mon, 22 Oct 2018 16:18:56 +0200
Subject: Backport rescue in Project#import_url from EE

EE added a `rescue` to the method Project#import_url, which could cause
merge conflicts when changing this method. This commit backports those
changes to CE, reducing the chances of running into a merge conflict.
---
 app/models/project.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/models/project.rb b/app/models/project.rb
index 086f256174f..4798fae82b7 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -688,6 +688,8 @@ class Project < ActiveRecord::Base
     else
       super
     end
+  rescue
+    super
   end
 
   def valid_import_url?
-- 
cgit v1.2.1