diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-07-08 18:00:42 -0400 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-07-08 18:00:42 -0400 |
| commit | 8a148793afc5e88dad27a975e9a7c1f5a7dfafc9 (patch) | |
| tree | 7e9b58c9fe8d26859bbda47d747267ad8b203fce | |
| parent | 0e5fbb29f42e43c2b43192d61d47402602dfd84f (diff) | |
| download | gitlab-ce-8a148793afc5e88dad27a975e9a7c1f5a7dfafc9.tar.gz | |
Simplify Issue and MergeRequest UpdateServicesrs-remove-task-states
Now that those pesky task states are gone, these become a lot simpler.
| -rw-r--r-- | app/services/issues/update_service.rb | 6 | ||||
| -rw-r--r-- | app/services/merge_requests/update_service.rb | 8 |
2 files changed, 4 insertions, 10 deletions
diff --git a/app/services/issues/update_service.rb b/app/services/issues/update_service.rb index e3b508d4965..f848ecedd6b 100644 --- a/app/services/issues/update_service.rb +++ b/app/services/issues/update_service.rb @@ -1,9 +1,7 @@ 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' @@ -16,7 +14,7 @@ module Issues filter_params old_labels = issue.labels.to_a - if params.present? && issue.update_attributes(params.except(:state_event)) + 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 108d755aa03..e5c5368f5d6 100644 --- a/app/services/merge_requests/update_service.rb +++ b/app/services/merge_requests/update_service.rb @@ -11,9 +11,7 @@ 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' @@ -26,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) - ) + if params.present? && merge_request.update_attributes(params) merge_request.reset_events_cache if merge_request.labels != old_labels |