From 8a148793afc5e88dad27a975e9a7c1f5a7dfafc9 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Wed, 8 Jul 2015 18:00:42 -0400
Subject: [PATCH] Simplify Issue and MergeRequest UpdateServices
Now that those pesky task states are gone, these become a lot simpler.
---
app/services/issues/update_service.rb | 6 ++----
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
--
GitLab