diff options
author | Ruben Davila <rdavila84@gmail.com> | 2017-01-18 19:48:16 +0300 |
---|---|---|
committer | Ruben Davila <rdavila84@gmail.com> | 2017-01-18 19:48:16 +0300 |
commit | 0f3c9355c1b57a56b4027df4deb78a2520596b15 (patch) | |
tree | 2b97df455017aa1c0c347b5f6d7255c295d9af67 /app/services/slash_commands | |
parent | 63b36241945a7f9bb280f360b3b269de8c5be8f6 (diff) |
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 'app/services/slash_commands')
-rw-r--r-- | app/services/slash_commands/interpret_service.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/app/services/slash_commands/interpret_service.rb b/app/services/slash_commands/interpret_service.rb index ea00415ae1f..ab69ce91d18 100644 --- a/app/services/slash_commands/interpret_service.rb +++ b/app/services/slash_commands/interpret_service.rb @@ -262,13 +262,10 @@ module SlashCommands current_user.can?(:"admin_#{issuable.to_ability_name}", issuable) end command :spend do |raw_duration| - reduce_time = raw_duration.sub!(/\A-/, '') time_spent = Gitlab::TimeTrackingFormatter.parse(raw_duration) if time_spent - time_spent *= -1 if reduce_time - - @updates[:spend_time] = time_spent + @updates[:spend_time] = { duration: time_spent, user: current_user } end end @@ -287,7 +284,7 @@ module SlashCommands current_user.can?(:"admin_#{issuable.to_ability_name}", project) end command :remove_time_spent do - @updates[:spend_time] = :reset + @updates[:spend_time] = { duration: :reset, user: current_user } end # This is a dummy command, so that it appears in the autocomplete commands |