diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-02-26 14:46:19 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2011-02-26 14:46:19 +0000 |
| commit | 2d115bbe707182293cd2dee6878fc0c696900736 (patch) | |
| tree | cfff15d19b62fd2cf7452b7515bacc02963f5fe4 /app/models/changeset.rb | |
| parent | a78d5659593d9fcce02a24a95c0ca0d111706465 (diff) | |
| download | redmine-2d115bbe707182293cd2dee6878fc0c696900736.tar.gz redmine-2d115bbe707182293cd2dee6878fc0c696900736.zip | |
Fixes syntax for time logging in commit messages (#7630, #7718).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4951 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/changeset.rb')
| -rw-r--r-- | app/models/changeset.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/models/changeset.rb b/app/models/changeset.rb index 01220a21f..0a6081393 100644 --- a/app/models/changeset.rb +++ b/app/models/changeset.rb @@ -97,11 +97,13 @@ class Changeset < ActiveRecord::Base TIMELOG_RE = / ( - (\d+([.,]\d+)?)h? + ((\d+)(h|hours?))((\d+)(m|min)?)? + | + ((\d+)(h|hours?|m|min)) | (\d+):(\d+) | - ((\d+)(h|hours?))?((\d+)(m|min)?)? + (\d+([\.,]\d+)?)h? ) /x |