Commit 82f17421 authored by Yorick Peterse's avatar Yorick Peterse

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.
parent 38b9ddea
...@@ -688,6 +688,8 @@ class Project < ActiveRecord::Base ...@@ -688,6 +688,8 @@ class Project < ActiveRecord::Base
else else
super super
end end
rescue
super
end end
def valid_import_url? def valid_import_url?
......
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