Merge branch 'backport-ee-import-url-rescue' into 'master'

Backport rescue in Project#import_url from EE See merge request gitlab-org/gitlab-ce!22520
2018-10-22 16:40:53 +00:00 · 2018-10-22 16:40:53 +00:00 · 0518e63bd9
parent 5adf178157 82f174217e
commit 0518e63bd9
1 changed files with 2 additions and 0 deletions
--- 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?