diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-01-14 14:23:42 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-01-14 14:23:42 +0100 |
| commit | 1b08cd811abeed18c3601e1b997b0566a243662c (patch) | |
| tree | 1b8f624b29bd2ae77d9344e31a3afe99f7b14536 /app/models/project.rb | |
| parent | c31d777c8f24029d7e11dd1e78eddf0c0b6e6f01 (diff) | |
| parent | e47f0e563d127f593f16c0a521c836e21bceb77f (diff) | |
| download | gitlab-ce-1b08cd811abeed18c3601e1b997b0566a243662c.tar.gz | |
Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into add-pagination-headers-to-api
Diffstat (limited to 'app/models/project.rb')
| -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 |