diff --git a/lib/redmine/scm/adapters/cvs_adapter.rb b/lib/redmine/scm/adapters/cvs_adapter.rb index c5f85f1c6203a9931377487acac52ab41bb97b3a..e84c1eea3c8d424c99c3d5c3c3793d27ed04b9bc 100644 --- a/lib/redmine/scm/adapters/cvs_adapter.rb +++ b/lib/redmine/scm/adapters/cvs_adapter.rb @@ -142,7 +142,8 @@ module Redmine if state=="entry_start" branch_map=Hash.new - if /^RCS file: #{Regexp.escape(root_url)}\/#{Regexp.escape(path_with_project)}(.+),v$/ =~ line + # gsub(/^:.*@[^:]+:/, '') is here to remove :pserver:anonymous@foo.bar: string if present in the url + if /^RCS file: #{Regexp.escape(root_url.gsub(/^:.*@[^:]+:/, ''))}\/#{Regexp.escape(path_with_project)}(.+),v$/ =~ line entry_path = normalize_cvs_path($1) entry_name = normalize_path(File.basename($1)) logger.debug("Path #{entry_path} <=> Name #{entry_name}") diff --git a/public/javascripts/calendar/lang/calendar-ru.js b/public/javascripts/calendar/lang/calendar-ru.js index 775bfc425e16582f376e9156a2e8c70b97567ba6..6274cc8922d81b90072e89d68520aa287faaa623 100644 --- a/public/javascripts/calendar/lang/calendar-ru.js +++ b/public/javascripts/calendar/lang/calendar-ru.js @@ -45,7 +45,7 @@ Calendar._SDN = new Array // First day of the week. "0" means display Sunday first, "1" means display // Monday first, etc. -Calendar._FD = 0; +Calendar._FD = 1; // full month names Calendar._MN = new Array