summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2013-07-15 21:06:54 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2013-07-15 21:06:54 +0000
commit01a9e17c49af318eb7e42b8833fe913c918998c2 (patch)
tree47bffcaa0a112253085d0954b5d4292a3991e2e0 /lib
parent9ca8b20d55343494fff3bd6de5a47f51f490b896 (diff)
downloadredmine-01a9e17c49af318eb7e42b8833fe913c918998c2.tar.gz
redmine-01a9e17c49af318eb7e42b8833fe913c918998c2.zip
CVS root_url not recognized when connection string does not include port (#14422).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@12027 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
-rw-r--r--lib/redmine/scm/adapters/cvs_adapter.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/redmine/scm/adapters/cvs_adapter.rb b/lib/redmine/scm/adapters/cvs_adapter.rb
index 3a0d27c34..d1096e725 100644
--- a/lib/redmine/scm/adapters/cvs_adapter.rb
+++ b/lib/redmine/scm/adapters/cvs_adapter.rb
@@ -335,7 +335,7 @@ module Redmine
# :pserver:anonymous@foo.bar:/path => /path
# :ext:cvsservername:/path => /path
def root_url_path
- root_url.to_s.gsub(/^:.+:\d*/, '')
+ root_url.to_s.gsub(%r{^:.+?(?=/)}, '')
end
# convert a date/time into the CVS-format