@@ -21,4 +21,5 @@ API objects manipulation
    gl_objects/runners
    gl_objects/settings
    gl_objects/system_hooks
+   gl_objects/todos
    gl_objects/users
@@ -73,3 +73,7 @@
 # project issue move
 issue.move(new_project_id)
 # end project issue move
+
+# project issue todo
+issue.todo()
+# end project issue todo
@@ -98,3 +98,9 @@ Move an issue to another project:
 .. literalinclude:: issues.py
    :start-after: # project issue move
    :end-before: # end project issue move
+
+Make an issue as todo:
+
+.. literalinclude:: issues.py
+   :start-after: # project issue todo
+   :end-before: # end project issue todo
@@ -59,3 +59,7 @@
 mr.subscribe()
 mr.unsubscribe()
 # end subscribe
+
+# todo
+mr.todo()
+# end todo
@@ -83,3 +83,9 @@ Subscribe/unsubscribe a MR:
 .. literalinclude:: mrs.py
    :start-after: # subscribe
    :end-before: # end subscribe
+
+Mark a MR as todo:
+
+.. literalinclude:: mrs.py
+   :start-after: # todo
+   :end-before: # end todo
@@ -0,0 +1,22 @@
+# list
+todos = gl.todos.list()
+# end list
+
+# filter
+todos = gl.todos.list(project_id=1)
+todos = gl.todos.list(state='done', type='Issue')
+# end filter
+
+# get
+todo = gl.todos.get(todo_id)
+# end get
+
+# delete
+gl.todos.delete(todo_id)
+# or
+todo.delete()
+# end delete
+
+# all_delete
+nb_of_closed_todos = gl.todos.delete_all()
+# end all_delete
@@ -0,0 +1,48 @@
+#####
+Todos
+#####
+
+Use :class:`~gitlab.objects.Todo` objects to manipulate todos. The
+:attr:`gitlab.Gitlab.todos` manager object provides helper functions.
+
+Examples
+--------
+
+List active todos:
+
+.. literalinclude:: todos.py
+   :start-after: # list
+   :end-before: # end list
+
+You can filter the list using the following parameters:
+
+* ``action``: can be ``assigned``, ``mentioned``, ``build_failed``, ``marked``,
+  or ``approval_required``
+* ``author_id``
+* ``project_id``
+* ``state``: can be ``pending`` or ``done``
+* ``type``: can be ``Issue`` or ``MergeRequest``
+
+For example:
+
+.. literalinclude:: todos.py
+   :start-after: # filter
+   :end-before: # end filter
+
+Get a single todo:
+
+.. literalinclude:: todos.py
+   :start-after: # get
+   :end-before: # end get
+
+Mark a todo as done:
+
+.. literalinclude:: todos.py
+   :start-after: # delete
+   :end-before: # end delete
+
+Mark all the todos as done:
+
+.. literalinclude:: todos.py
+   :start-after: # all_delete
+   :end-before: # end all_delete
@@ -124,6 +124,7 @@ class Gitlab(object):
         team_members (TeamMemberManager): Manager for GitLab teams members
         team_projects (TeamProjectManager): Manager for GitLab teams projects
         teams (TeamManager): Manager for GitLab teams
+        todos (TodoManager): Manager for user todos
     """
 
     def __init__(self, url, private_token=None, email=None, password=None,
@@ -191,6 +192,7 @@ def __init__(self, url, private_token=None, email=None, password=None,
         self.team_members = TeamMemberManager(self)
         self.team_projects = TeamProjectManager(self)
         self.teams = TeamManager(self)
+        self.todos = TodoManager(self)
 
     @staticmethod
     def from_config(gitlab_id=None, config_files=None):
 
@@ -111,6 +111,10 @@ class GitlabMROnBuildSuccessError(GitlabOperationError):
     pass
 
 
+class GitlabTodoError(GitlabOperationError):
+    pass
+
+
 def raise_error_from_response(response, error, expected_code=200):
     """Tries to parse gitlab error message from response and raises error.
 
 
@@ -1237,6 +1237,17 @@ def move(self, to_project_id, **kwargs):
         raise_error_from_response(r, GitlabUpdateError, 201)
         self._set_from_dict(r.json())
 
+    def todo(self, **kwargs):
+        """Create a todo for the issue.
+
+        Raises:
+            GitlabConnectionError: If the server cannot be reached.
+        """
+        url = ('/projects/%(project_id)s/issues/%(issue_id)s/todo' %
+               {'project_id': self.project_id, 'issue_id': self.id})
+        r = self.gitlab._raw_post(url, **kwargs)
+        raise_error_from_response(r, GitlabTodoError, [201, 304])
+
 
 class ProjectIssueManager(BaseManager):
     obj_cls = ProjectIssue
@@ -1498,6 +1509,17 @@ def merge(self, merge_commit_message=None,
         raise_error_from_response(r, errors)
         self._set_from_dict(r.json())
 
+    def todo(self, **kwargs):
+        """Create a todo for the merge request.
+
+        Raises:
+            GitlabConnectionError: If the server cannot be reached.
+        """
+        url = ('/projects/%(project_id)s/merge_requests/%(mr_id)s/todo' %
+               {'project_id': self.project_id, 'mr_id': self.id})
+        r = self.gitlab._raw_post(url, **kwargs)
+        raise_error_from_response(r, GitlabTodoError, [201, 304])
+
 
 class ProjectMergeRequestManager(BaseManager):
     obj_cls = ProjectMergeRequest
@@ -2154,7 +2176,7 @@ def all(self, scope=None, **kwargs):
 
         Raises:
             GitlabConnectionError: If the server cannot be reached.
-            GitlabListError; If the resource cannot be found
+            GitlabListError: If the resource cannot be found
         """
         url = '/runners/all'
         if scope is not None:
@@ -2170,6 +2192,33 @@ class TeamMember(GitlabObject):
     shortPrintAttr = 'username'
 
 
+class Todo(GitlabObject):
+    _url = '/todos'
+    canGet = 'from_list'
+    canUpdate = False
+    canCreate = False
+    optionalListAttrs = ['action', 'author_id', 'project_id', 'state', 'type']
+
+
+class TodoManager(BaseManager):
+    obj_cls = Todo
+
+    def delete_all(self, **kwargs):
+        """Mark all the todos as done.
+
+        Raises:
+            GitlabConnectionError: If the server cannot be reached.
+            GitlabDeleteError: If the resource cannot be found
+
+        Returns:
+            The number of todos maked done.
+        """
+        url = '/todos'
+        r = self.gitlab._raw_delete(url, **kwargs)
+        raise_error_from_response(r, GitlabDeleteError)
+        return int(r.text)
+
+
 class UserProject(GitlabObject):
     _url = '/projects/user/%(user_id)s'
     _constructorTypes = {'owner': 'User', 'namespace': 'Group'}