summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-02-24 05:58:59 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-02-24 05:58:59 +0000
commit9937ac677f388d84f689c54539ee5f833cec3d49 (patch)
treef8ca511e83b8fd18f853b3127c33e83e02e186f5 /app
parent4bf84ca468dbd31d77747868156c01cd87cf3ff6 (diff)
downloadredmine-9937ac677f388d84f689c54539ee5f833cec3d49.tar.gz
redmine-9937ac677f388d84f689c54539ee5f833cec3d49.zip
scm: update adapter initialize() to use path encoding (#2664, #2274).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4941 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r--app/models/repository.rb11
1 files changed, 6 insertions, 5 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb
index d1e3d8b2f..c9d7d0dbe 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -26,12 +26,12 @@ class Repository < ActiveRecord::Base
# Checks if the SCM is enabled when creating a repository
validate_on_create { |r| r.errors.add(:type, :invalid) unless Setting.enabled_scm.include?(r.class.name.demodulize) }
-
+
# Removes leading and trailing whitespace
def url=(arg)
write_attribute(:url, arg ? arg.to_s.strip : nil)
end
-
+
# Removes leading and trailing whitespace
def root_url=(arg)
write_attribute(:root_url, arg ? arg.to_s.strip : nil)
@@ -42,11 +42,12 @@ class Repository < ActiveRecord::Base
end
def scm
- @scm ||= self.scm_adapter.new url, root_url, login, password
+ @scm ||= self.scm_adapter.new(url, root_url,
+ login, password, path_encoding)
update_attribute(:root_url, @scm.root_url) if root_url.blank?
@scm
end
-
+
def scm_name
self.class.scm_name
end
@@ -248,7 +249,7 @@ class Repository < ActiveRecord::Base
end
private
-
+
def before_save
# Strips url and root_url
url.strip!