diff options
author | Yorick Peterse <yorickpeterse@gmail.com> | 2018-10-22 17:18:56 +0300 |
---|---|---|
committer | Yorick Peterse <yorickpeterse@gmail.com> | 2018-10-22 17:18:56 +0300 |
commit | 82f174217e0515576f2bd53fc836995e5daaa333 (patch) | |
tree | 4365cce9e9af510a07fb254131bc3f463d97dace /app/models | |
parent | 38b9ddeaeb5e8ef0d08137cb2795d510811ac989 (diff) |
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.
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/project.rb | 2 |
1 files changed, 2 insertions, 0 deletions
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? |