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

Merge branch 'fix-safe-import-url' into 'master'
cda96354 · Douwe Maan · 9f8c38bd · d11ca78c · cda96354
Commit cda96354 authored Jan 14, 2016 by Douwe Maan
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

project.rb app/models/project.rb +1 -1

No files found.
--- 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