Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | Merge branch 'issue_13463' into 'master' | Jacob Schatz | 2016-02-22 | 3 | -1/+10 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Side-by-side view after loading diff results Fixes #13463 See merge request !2880 | |||||
| * | | | | | | | Update button selectorissue_13463 | Alfredo Sumaran | 2016-02-19 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | Fixes syntax error | Alfredo Sumaran | 2016-02-19 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | Change method name for consistency | Alfredo Sumaran | 2016-02-19 | 1 | -2/+2 | |
| | | | | | | | | ||||||
| * | | | | | | | Make diff view name getter less error prone | Alfredo Sumaran | 2016-02-19 | 2 | -5/+3 | |
| | | | | | | | | ||||||
| * | | | | | | | Add comment | Alfredo Sumaran | 2016-02-19 | 1 | -0/+2 | |
| | | | | | | | | ||||||
| * | | | | | | | Add missing class to builds page | Alfredo Sumaran | 2016-02-18 | 1 | -0/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | Expand view container if diff mode is set to paralells | Alfredo Sumaran | 2016-02-18 | 1 | -0/+8 | |
| | | | | | | | | ||||||
* | | | | | | | | Merge branch 'add_missing_doc' into 'master' | Achilleas Pipinellis | 2016-02-22 | 2 | -0/+8 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add when the API changes got introduced See merge request !2912 | |||||
| * | | | | | | | | Add when the API changes got introduced | Achilleas Pipinellis | 2016-02-22 | 2 | -0/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | |||||
* | | | | | | | | | Merge branch 'fix-failing-issue-tests' into 'master' | Rémy Coutable | 2016-02-22 | 4 | -17/+7 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed failing issues tests Also removed up/down vote icons from merge requests. Was missed from d8069bd85863ab8c47d2bb2370221b17fb686b93 See merge request !2911 | |||||
| * | | | | | | | | removed merge-request-no-votes css class | Phil Hughes | 2016-02-22 | 1 | -3/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Fixed failing issues tests | Phil Hughes | 2016-02-22 | 3 | -14/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed up/down vote icons from merge requests. Was missed from d8069bd85863ab8c47d2bb2370221b17fb686b93 | |||||
* | | | | | | | | | Update CHANGELOG and VERSION for 8.6.0-pre | Rémy Coutable | 2016-02-22 | 2 | -2/+4 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge branch 'fix-zero-votes-showing-on-issue-list' into 'master' | Rémy Coutable | 2016-02-22 | 2 | -11/+3 | |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only show up or down votes icon on issue list if there are any Closes #13649  See merge request !2909 | |||||
| * | | | | | | | Only show up or down votes icon on issue list if there are any | Phil Hughes | 2016-02-22 | 2 | -11/+3 | |
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | Closes #13649 | |||||
* | | | | | | | Merge branch 'tasks' into 'master' | Douglas Barbosa Alexandre | 2016-02-22 | 46 | -20/+1633 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Todos Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/2425 Tasks: - Prepare database - [X] Create a new table (`todos`) - Tasks Queue view - [X] Add a number icon showing the number of todos on the top right next to the new and logout button that will redirect the user to the todos page - [X] Add a chronological list of todos, with the 'Todos' tab active by default - [X] Add a 'Done' button to each todo - [x] Add filters (project, author, type, and action) - Todos generation - [X] When user issue/mr is assgined to someone - [x] When user is mentioned on (issues/mr's/comments) - Mark todo as `done` - [X] When clicks on the 'Done' button - [X] When edit issue/mr - [X] When left/edit a comment - [X] When reassign issue/mr - [X] When add/remove labels to issue/mr - [X] When issue/mr is closed - [X] When mr is merged - [X] When added an emoji - [X] When changed the issue/mr milestone * Screenshot:  See merge request !2817 | |||||
| * | | | | | | | Add missing route to mark all todos as donetasks | Douglas Barbosa Alexandre | 2016-02-21 | 1 | -1/+6 | |
| | | | | | | | | ||||||
| * | | | | | | | Use before_action instead of before_filter | Douglas Barbosa Alexandre | 2016-02-21 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | Update feature spec | Douwe Maan | 2016-02-20 | 1 | -10/+10 | |
| | | | | | | | | ||||||
| * | | | | | | | "X assigned you Y" instead of "X assigned Y" | Douwe Maan | 2016-02-20 | 3 | -12/+8 | |
| | | | | | | | | ||||||
| * | | | | | | | Add "Mark all as done" button | Douwe Maan | 2016-02-20 | 3 | -5/+49 | |
| | | | | | | | | ||||||
| * | | | | | | | Include 'issue'/'merge request' in link | Douwe Maan | 2016-02-20 | 2 | -10/+5 | |
| | | | | | | | | ||||||
| * | | | | | | | Rename tab from 'Todos' to 'To do' | Douwe Maan | 2016-02-20 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | Fix rubucop offenses | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -2/+0 | |
| | | | | | | | | ||||||
| * | | | | | | | Rename Tasks to Todos | Douglas Barbosa Alexandre | 2016-02-20 | 45 | -602/+604 | |
| | | | | | | | | ||||||
| * | | | | | | | Rename IssuableBaseService#have_changes? to has_changes? | Douglas Barbosa Alexandre | 2016-02-20 | 3 | -3/+3 | |
| | | | | | | | | ||||||
| * | | | | | | | Refactoring TasksHelper | Douglas Barbosa Alexandre | 2016-02-20 | 2 | -9/+2 | |
| | | | | | | | | ||||||
| * | | | | | | | Improve tasks page list UI | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -2/+2 | |
| | | | | | | | | ||||||
| * | | | | | | | Create or mark task pending as soon the action happens | Douglas Barbosa Alexandre | 2016-02-20 | 5 | -4/+4 | |
| | | | | | | | | ||||||
| * | | | | | | | Rename menu item and page 'Task queue' to 'Tasks' | Douglas Barbosa Alexandre | 2016-02-20 | 5 | -11/+11 | |
| | | | | | | | | ||||||
| * | | | | | | | Ensure that we only have one task per issue/mr | Douglas Barbosa Alexandre | 2016-02-20 | 4 | -110/+82 | |
| | | | | | | | | ||||||
| * | | | | | | | Explicit mention of the assignee make a task | Douglas Barbosa Alexandre | 2016-02-20 | 2 | -10/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since potentially the previous assign-task has already been handled. | |||||
| * | | | | | | | :lipstick: Cosmetic changes | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -21/+21 | |
| | | | | | | | | ||||||
| * | | | | | | | Refactoring task queue partials | Douglas Barbosa Alexandre | 2016-02-20 | 6 | -79/+37 | |
| | | | | | | | | ||||||
| * | | | | | | | Improve formatted message for tasks when action is a mention | Douglas Barbosa Alexandre | 2016-02-20 | 3 | -5/+11 | |
| | | | | | | | | ||||||
| * | | | | | | | Use destroy, in case we ever have before_destroy callbacks on Task | Douglas Barbosa Alexandre | 2016-02-20 | 2 | -2/+2 | |
| | | | | | | | | ||||||
| * | | | | | | | Fix task factory | Douglas Barbosa Alexandre | 2016-02-20 | 3 | -3/+6 | |
| | | | | | | | | ||||||
| * | | | | | | | Fix rubocop offenses | Douglas Barbosa Alexandre | 2016-02-20 | 2 | -4/+4 | |
| | | | | | | | | ||||||
| * | | | | | | | Update CHANGELOG | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -0/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | Fix pending examples from task model spec | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -4/+30 | |
| | | | | | | | | ||||||
| * | | | | | | | Add filters by project, author, type, and action to task queue page list | Douglas Barbosa Alexandre | 2016-02-20 | 6 | -37/+317 | |
| | | | | | | | | ||||||
| * | | | | | | | Add a link to Task Queue on dashboard sidebar | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -6/+12 | |
| | | | | | | | | ||||||
| * | | | | | | | Create a pending task when a user is mentioned when edit a issue/mr/note | Douglas Barbosa Alexandre | 2016-02-20 | 10 | -100/+146 | |
| | | | | | | | | ||||||
| * | | | | | | | Does not create a task if new assignee is the current user | Douglas Barbosa Alexandre | 2016-02-20 | 2 | -4/+15 | |
| | | | | | | | | ||||||
| * | | | | | | | Create a pending task when a user is mentioned on a note | Douglas Barbosa Alexandre | 2016-02-20 | 13 | -21/+146 | |
| | | | | | | | | ||||||
| * | | | | | | | Create a pending task when a user is mentioned on issue/mr | Douglas Barbosa Alexandre | 2016-02-20 | 3 | -36/+94 | |
| | | | | | | | | ||||||
| * | | | | | | | Rename TaskService#mark_as_done to mark_pending_tasks_as_done | Douglas Barbosa Alexandre | 2016-02-20 | 4 | -10/+10 | |
| | | | | | | | | ||||||
| * | | | | | | | Move common behavior to to IssuableBaseService | Douglas Barbosa Alexandre | 2016-02-20 | 3 | -34/+13 | |
| | | | | | | | | ||||||
| * | | | | | | | Marks pending tasks for an user as done when he merge the MR | Douglas Barbosa Alexandre | 2016-02-20 | 3 | -0/+26 | |
| | | | | | | | |