summaryrefslogtreecommitdiff
path: root/app/services/merge_requests/update_service.rb
diff options
context:
space:
mode:
authorDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-02-18 19:12:52 -0200
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-02-20 12:12:05 -0200
commitfc3f8a8ff75a09aae62b2a56c7f78fd9d21d2af3 (patch)
tree283974010e5b0caeafc2c91c864c30bbc27bd758 /app/services/merge_requests/update_service.rb
parent44656136475d8842628d0a1112aecc9ec412a16f (diff)
downloadgitlab-ce-fc3f8a8ff75a09aae62b2a56c7f78fd9d21d2af3.tar.gz
Ensure that we only have one task per issue/mr
Diffstat (limited to 'app/services/merge_requests/update_service.rb')
-rw-r--r--app/services/merge_requests/update_service.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/app/services/merge_requests/update_service.rb b/app/services/merge_requests/update_service.rb
index 87949f0a9b8..a89daf9821e 100644
--- a/app/services/merge_requests/update_service.rb
+++ b/app/services/merge_requests/update_service.rb
@@ -16,6 +16,11 @@ module MergeRequests
def handle_changes(merge_request, options = {})
if have_changes?(merge_request, options)
+ task_service.mark_pending_tasks_as_done(merge_request, current_user)
+ end
+
+ if merge_request.previous_changes.include?('title') ||
+ merge_request.previous_changes.include?('description')
task_service.update_merge_request(merge_request, current_user)
end