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/issuable_base_service.rb | |
| 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/issuable_base_service.rb')
| -rw-r--r-- | app/services/issuable_base_service.rb | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/app/services/issuable_base_service.rb b/app/services/issuable_base_service.rb index 7491c256b99..5f3ced49665 100644 --- a/app/services/issuable_base_service.rb +++ b/app/services/issuable_base_service.rb @@ -164,7 +164,6 @@ class IssuableBaseService < BaseService def create(issuable) merge_slash_commands_into_params!(issuable) filter_params(issuable) - change_time_spent(issuable) params.delete(:state_event) params[:author] ||= current_user @@ -207,14 +206,13 @@ class IssuableBaseService < BaseService change_subscription(issuable) change_todo(issuable) filter_params(issuable) - time_spent = change_time_spent(issuable) old_labels = issuable.labels.to_a old_mentioned_users = issuable.mentioned_users.to_a label_ids = process_label_ids(params, existing_label_ids: issuable.label_ids) params[:label_ids] = label_ids if labels_changing?(issuable.label_ids, label_ids) - if (params.present? || time_spent) && update_issuable(issuable, params) + if params.present? && update_issuable(issuable, params) # We do not touch as it will affect a update on updated_at field ActiveRecord::Base.no_touching do handle_common_system_notes(issuable, old_labels: old_labels) @@ -261,12 +259,6 @@ class IssuableBaseService < BaseService end end - def change_time_spent(issuable) - time_spent = params.delete(:spend_time) - - issuable.spend_time(time_spent, current_user) if time_spent - end - def has_changes?(issuable, old_labels: []) valid_attrs = [:title, :description, :assignee_id, :milestone_id, :target_branch] |