From f36ce067431216537927a9fc3e08373f906c36a5 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Thu, 14 Jan 2016 10:53:13 +0000
Subject: [PATCH] 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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/models/project.rb b/app/models/project.rb
index 31990485f7..7e13115151 100644
--- a/app/models/project.rb
+++ b/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
--
2.30.9