##// END OF EJS Templates
Accept any svn tunnel scheme in repository URL (#3278)....
Jean-Philippe Lang -
r2624:752e263d3a42
parent child
Show More
@@ -147,7 +147,7 module RepositoriesHelper
147
147
148 def subversion_field_tags(form, repository)
148 def subversion_field_tags(form, repository)
149 content_tag('p', form.text_field(:url, :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?)) +
149 content_tag('p', form.text_field(:url, :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?)) +
150 '<br />(http://, https://, svn://, file:///)') +
150 '<br />(file:///, http://, https://, svn://, svn+[tunnelscheme]://)') +
151 content_tag('p', form.text_field(:login, :size => 30)) +
151 content_tag('p', form.text_field(:login, :size => 30)) +
152 content_tag('p', form.password_field(:password, :size => 30, :name => 'ignore',
152 content_tag('p', form.password_field(:password, :size => 30, :name => 'ignore',
153 :value => ((repository.new_record? || repository.password.blank?) ? '' : ('x'*15)),
153 :value => ((repository.new_record? || repository.password.blank?) ? '' : ('x'*15)),
@@ -20,7 +20,7 require 'redmine/scm/adapters/subversion_adapter'
20 class Repository::Subversion < Repository
20 class Repository::Subversion < Repository
21 attr_protected :root_url
21 attr_protected :root_url
22 validates_presence_of :url
22 validates_presence_of :url
23 validates_format_of :url, :with => /^(http|https|svn|svn\+ssh|file):\/\/.+/i
23 validates_format_of :url, :with => /^(http|https|svn(\+[^\s:\/\\]+)?|file):\/\/.+/i
24
24
25 def scm_adapter
25 def scm_adapter
26 Redmine::Scm::Adapters::SubversionAdapter
26 Redmine::Scm::Adapters::SubversionAdapter
General Comments 0
You need to be logged in to leave comments. Login now