diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-09 08:30:19 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-09 08:30:19 +0000 |
| commit | b6821ff4ea796a536bfc142a8c6d0e43b406067c (patch) | |
| tree | ffda363cbdf0d3f586c5f6b6dc91a48dbadb729b | |
| parent | 43e410ad04d2e2927a79b31623c9dee084e04863 (diff) | |
| parent | 8a148793afc5e88dad27a975e9a7c1f5a7dfafc9 (diff) | |
| download | gitlab-ce-b6821ff4ea796a536bfc142a8c6d0e43b406067c.tar.gz | |
Merge branch 'rs-remove-task-states' into 'master'
Remove unused `task_[un]check` states from Update services
These were left over from the old Task handling.
See merge request !942
| -rw-r--r-- | app/services/issues/update_service.rb | 11 | ||||
| -rw-r--r-- | app/services/merge_requests/update_service.rb | 12 |
2 files changed, 4 insertions, 19 deletions
diff --git a/app/services/issues/update_service.rb b/app/services/issues/update_service.rb index 3220facaf7c..f848ecedd6b 100644 --- a/app/services/issues/update_service.rb +++ b/app/services/issues/update_service.rb @@ -1,17 +1,11 @@ module Issues class UpdateService < Issues::BaseService def execute(issue) - state = params[:state_event] - - case state + case params.delete(:state_event) when 'reopen' Issues::ReopenService.new(project, current_user, {}).execute(issue) when 'close' Issues::CloseService.new(project, current_user, {}).execute(issue) - when 'task_check' - issue.update_nth_task(params[:task_num].to_i, true) - when 'task_uncheck' - issue.update_nth_task(params[:task_num].to_i, false) end params[:assignee_id] = "" if params[:assignee_id] == IssuableFinder::NONE @@ -20,8 +14,7 @@ module Issues filter_params old_labels = issue.labels.to_a - if params.present? && issue.update_attributes(params.except(:state_event, - :task_num)) + if params.present? && issue.update_attributes(params) issue.reset_events_cache if issue.labels != old_labels diff --git a/app/services/merge_requests/update_service.rb b/app/services/merge_requests/update_service.rb index f6570f52241..e5c5368f5d6 100644 --- a/app/services/merge_requests/update_service.rb +++ b/app/services/merge_requests/update_service.rb @@ -11,17 +11,11 @@ module MergeRequests params.except!(:target_project_id) params.except!(:source_branch) - state = params[:state_event] - - case state + case params.delete(:state_event) when 'reopen' MergeRequests::ReopenService.new(project, current_user, {}).execute(merge_request) when 'close' MergeRequests::CloseService.new(project, current_user, {}).execute(merge_request) - when 'task_check' - merge_request.update_nth_task(params[:task_num].to_i, true) - when 'task_uncheck' - merge_request.update_nth_task(params[:task_num].to_i, false) end params[:assignee_id] = "" if params[:assignee_id] == IssuableFinder::NONE @@ -30,9 +24,7 @@ module MergeRequests filter_params old_labels = merge_request.labels.to_a - if params.present? && merge_request.update_attributes( - params.except(:state_event, :task_num) - ) + if params.present? && merge_request.update_attributes(params) merge_request.reset_events_cache if merge_request.labels != old_labels |