Merge branch 'fix-safe-import-url' into 'master'

Fix the undefinded variable error in Project's safe_import_url method

Fixes #7982

See merge request !2419

app/models/project.rb

@@ -397,7 +397,7 @@ class Project < ActiveRecord::Base
     result.password = '*****' unless result.password.nil?
     result.to_s
   rescue
-    original_url
+    self.import_url
   end
 
   def check_limit