diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-10-22 16:40:53 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-10-22 16:40:53 +0000 |
| commit | 0518e63bd9d3ccf69bd79c3427a980a73e9ffe2e (patch) | |
| tree | 8890bea3de94fea66e98fe0c2d44985e441f259b | |
| parent | 5adf178157837251d86f2b2d682e835acd0b0944 (diff) | |
| parent | 82f174217e0515576f2bd53fc836995e5daaa333 (diff) | |
| download | gitlab-ce-0518e63bd9d3ccf69bd79c3427a980a73e9ffe2e.tar.gz | |
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
| -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? |