diff options
| author | Ruben Davila <rdavila84@gmail.com> | 2017-01-18 10:48:16 -0600 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2017-01-18 10:48:16 -0600 |
| commit | 0f3c9355c1b57a56b4027df4deb78a2520596b15 (patch) | |
| tree | 2b97df455017aa1c0c347b5f6d7255c295d9af67 /lib/gitlab/time_tracking_formatter.rb | |
| parent | 63b36241945a7f9bb280f360b3b269de8c5be8f6 (diff) | |
| download | gitlab-ce-0f3c9355c1b57a56b4027df4deb78a2520596b15.tar.gz | |
Add some API endpoints for time tracking.
New endpoints are:
POST :project_id/(issues|merge_requests)/(:issue_id|:merge_request_id)/time_estimate"
POST :project_id/(issues|merge_requests)/(:issue_id|:merge_request_id)/reset_time_estimate"
POST :project_id/(issues|merge_requests)/(:issue_id|:merge_request_id)/add_spent_time"
POST :project_id/(issues|merge_requests)/(:issue_id|:merge_request_id)/reset_spent_time"
GET :project_id/(issues|merge_requests)/(:issue_id|:merge_request_id)/time_stats"
Diffstat (limited to 'lib/gitlab/time_tracking_formatter.rb')
| -rw-r--r-- | lib/gitlab/time_tracking_formatter.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/gitlab/time_tracking_formatter.rb b/lib/gitlab/time_tracking_formatter.rb index d09063c6c8f..d615c24149a 100644 --- a/lib/gitlab/time_tracking_formatter.rb +++ b/lib/gitlab/time_tracking_formatter.rb @@ -4,7 +4,11 @@ module Gitlab def parse(string) with_custom_config do - ChronicDuration.parse(string, default_unit: 'hours') rescue nil + string.sub!(/\A-/, '') + + seconds = ChronicDuration.parse(string, default_unit: 'hours') rescue nil + seconds *= -1 if seconds && Regexp.last_match + seconds end end |