diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-01-14 10:53:13 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-01-14 10:53:13 +0000 |
| commit | cda9635441fee1543966830a0ba1d95221b2a379 (patch) | |
| tree | 60b872ed79856d950077e57e7b075358ccd04c49 | |
| parent | 9f8c38bdac3d6f532b50ecab1d769652ffb5acc3 (diff) | |
| parent | d11ca78cdcd761f7f9b6388474765ede51011085 (diff) | |
| download | gitlab-ce-cda9635441fee1543966830a0ba1d95221b2a379.tar.gz | |
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
| -rw-r--r-- | app/models/project.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index 31990485f7d..7e131151513 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 |