Automatic merge of gitlab-org/gitlab-ce master

app/services/task_list_toggle_service.rb

@@ -33,7 +33,7 @@ class TaskListToggleService
     markdown_task     = source_lines[source_line_index]
 
     # The source in the DB could be using either \n or \r\n line endings
-    return unless markdown_task == line_source || markdown_task == line_source + "\r"
+    return unless markdown_task.chomp == line_source
     return unless source_checkbox = Taskable::ITEM_PATTERN.match(markdown_task)
 
     currently_checked = TaskList::Item.new(source_checkbox[1]).complete?