Merged r12017 and r12027 from trunk (#14422).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12065 e93f8b46-1217-0410-a6f0-8f06a7374b81
2013-07-28 20:48:52 +00:00
parent e8757fec2b
commit e1e006f09e
2 changed files with 17 additions and 1 deletions
@@ -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