Commit f36ce067 authored by Douwe Maan's avatar Douwe Maan Committed by Robert Speicher

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
parent d139276a
...@@ -397,7 +397,7 @@ class Project < ActiveRecord::Base ...@@ -397,7 +397,7 @@ class Project < ActiveRecord::Base
result.password = '*****' unless result.password.nil? result.password = '*****' unless result.password.nil?
result.to_s result.to_s
rescue rescue
original_url self.import_url
end end
def check_limit def check_limit
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment