Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Does not create a todo when commenting on commit or project snippet | Douglas Barbosa Alexandre | 2016-02-24 | 2 | -3/+2 |
| | |||||
* | Check the HEAD of branch when doing Merge When Succeededimprove-merge-when-succeeded | Kamil Trzcinski | 2016-02-22 | 1 | -3/+9 |
| | |||||
* | Merge branch 'tasks' into 'master' | Douglas Barbosa Alexandre | 2016-02-22 | 12 | -6/+221 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: ![Screenshot_2016-02-20_12.45.57](/uploads/4b2554b1bde25aed3347e1ae41e8e0c0/Screenshot_2016-02-20_12.45.57.png) See merge request !2817 | ||||
| * | Rename Tasks to Todos | Douglas Barbosa Alexandre | 2016-02-20 | 10 | -58/+58 |
| | | |||||
| * | Rename IssuableBaseService#have_changes? to has_changes? | Douglas Barbosa Alexandre | 2016-02-20 | 3 | -3/+3 |
| | | |||||
| * | Create or mark task pending as soon the action happens | Douglas Barbosa Alexandre | 2016-02-20 | 3 | -3/+1 |
| | | |||||
| * | Ensure that we only have one task per issue/mr | Douglas Barbosa Alexandre | 2016-02-20 | 3 | -92/+66 |
| | | |||||
| * | Explicit mention of the assignee make a task | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -6/+5 |
| | | | | | | | | Since potentially the previous assign-task has already been handled. | ||||
| * | :lipstick: Cosmetic changes | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -21/+21 |
| | | |||||
| * | Create a pending task when a user is mentioned when edit a issue/mr/note | Douglas Barbosa Alexandre | 2016-02-20 | 3 | -16/+67 |
| | | |||||
| * | Does not create a task if new assignee is the current user | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -4/+3 |
| | | |||||
| * | Create a pending task when a user is mentioned on a note | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -3/+14 |
| | | |||||
| * | Create a pending task when a user is mentioned on issue/mr | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -6/+26 |
| | | |||||
| * | Rename TaskService#mark_as_done to mark_pending_tasks_as_done | Douglas Barbosa Alexandre | 2016-02-20 | 3 | -8/+8 |
| | | |||||
| * | 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 | 2 | -0/+9 |
| | | |||||
| * | Marks pending tasks for an user as done when he close the MR | Douglas Barbosa Alexandre | 2016-02-20 | 2 | -1/+10 |
| | | |||||
| * | Marks pending tasks for an user as done when he edit a MR | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -0/+21 |
| | | |||||
| * | Create a pending task when an MR is assigned to someone | Douglas Barbosa Alexandre | 2016-02-20 | 3 | -7/+33 |
| | | |||||
| * | Mark pending tasks for the current user as done when he edit a note | Douglas Barbosa Alexandre | 2016-02-20 | 2 | -0/+15 |
| | | |||||
| * | Mark pending tasks for the note author as done when he left a note | Douglas Barbosa Alexandre | 2016-02-20 | 2 | -2/+13 |
| | | |||||
| * | Marks pending tasks for an user as done when he close the issue | Douglas Barbosa Alexandre | 2016-02-20 | 2 | -0/+10 |
| | | |||||
| * | Marks pending tasks for an user as done when he edit an issue | Douglas Barbosa Alexandre | 2016-02-20 | 4 | -3/+37 |
| | | |||||
| * | Does not create a task for new issue when assignee is the current user | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -1/+1 |
| | | |||||
| * | Create a pending task when an issue is assigned to someone | Douglas Barbosa Alexandre | 2016-02-20 | 4 | -0/+49 |
| | | |||||
* | | Discover branches for commit statuses ref-less when doing merge when succeededmerge-when-succeeded | Kamil Trzcinski | 2016-02-19 | 1 | -5/+10 |
|/ | |||||
* | Some updates from last code review. | Rubén Dávila | 2016-02-19 | 1 | -7/+3 |
| | |||||
* | Refactor RevertService. | Rubén Dávila | 2016-02-19 | 1 | -30/+24 |
| | |||||
* | Some fixes and refactors for code related to forks. | Rubén Dávila | 2016-02-19 | 1 | -4/+25 |
| | |||||
* | Don't make Repository#revert aware of MRs. | Rubén Dávila | 2016-02-19 | 1 | -2/+6 |
| | |||||
* | Update copy and URLs used when reverting MRs. | Rubén Dávila | 2016-02-19 | 1 | -1/+1 |
| | |||||
* | Big refactor for #revert_commit. | Rubén Dávila | 2016-02-19 | 1 | -10/+1 |
| | | | | | | * Now checking if a commit is already reverted or there is a conflict is much more faster. * No longer need to create a new branch. | ||||
* | Some fixes required for conflicts on revert. | Rubén Dávila | 2016-02-19 | 1 | -2/+4 |
| | |||||
* | Make it work for merge commits. | Rubén Dávila | 2016-02-19 | 1 | -3/+1 |
| | |||||
* | Make MRs with revert commit work. | Rubén Dávila | 2016-02-19 | 1 | -6/+10 |
| | |||||
* | Add RevertService class with basic logic to revert commit | Rubén Dávila | 2016-02-19 | 1 | -0/+48 |
| | |||||
* | Use adequate description for new MR. | Rubén Dávila | 2016-02-19 | 1 | -1/+1 |
| | |||||
* | Save merge commit id when MR is merged | Rubén Dávila | 2016-02-19 | 1 | -1/+2 |
| | |||||
* | Merge branch 'fix/ci-first-job-allow-failure' into 'master' | Kamil Trzciński | 2016-02-18 | 1 | -0/+1 |
|\ | | | | | | | | | | | | | | | | | Fix CI builds scheduler when first build in stage is allowed to fail This fixes an edge case in CI builds scheduler when first build in stage was marked as allowed to fail. Closes #3192 See merge request !2869 | ||||
| * | Return a builds array in builds create service | Grzegorz Bizon | 2016-02-18 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'fix/gitpushservice-complexity-issue' into 'master' | Douwe Maan | 2016-02-18 | 1 | -57/+61 |
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce code complexity on GitPushService#execute Code complexity for gitlab-ce after this has been refactored: ``` 27.3: GitPushService#execute ``` This still needs to be merged into `gitlab-ee` presumably with conflicts... Perhaps we should create another issue for doing that? I left the code sort of similar to what it was... If I could, I would have refactored most of the code into separate classes, etc. as it breaks probably all SOLID principles. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/13327 See merge request !2784 | ||||
| * | refactored some stuff based on MR feedback | James Lopez | 2016-02-17 | 1 | -3/+3 |
| | | |||||
| * | refactored GitPushService and updated spec | James Lopez | 2016-02-15 | 1 | -28/+19 |
| | | |||||
| * | typo | James Lopez | 2016-02-12 | 1 | -1/+1 |
| | | |||||
| * | attempt to reduce code complexity on GitPushService#execute | James Lopez | 2016-02-11 | 1 | -53/+66 |
| | | |||||
* | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵git-archive-refactor | Jacob Vosmaer | 2016-02-17 | 1 | -1/+13 |
|\ \ | | | | | | | | | | git-archive-refactor | ||||
| * | | Flush all repository caches when deleting a repoexpire-fork-import-caches | Yorick Peterse | 2016-02-17 | 1 | -1/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | This ensures that _all_ caches (including any caches normally only flushed under certain conditions) are flushed whenever a project is removed. Because cache keys are based on project namespaces (excluding IDs) not doing so could result in a newly created project re-using old caches (if the project was re-created using the same name). | ||||
* | | | Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ↵ | Jacob Vosmaer | 2016-02-17 | 6 | -29/+43 |
|\ \ \ | |/ / | | | | | | | git-archive-refactor | ||||
| * | | Merge branch 'fix/cross-reference-notes-forks' into 'master' | Douwe Maan | 2016-02-16 | 1 | -5/+14 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix cross reference notes on forks Updates `cross_reference_exists?` to match on commit only. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/5849 See merge request !2731 | ||||
| | * | | updated system note service and spec based on feedback | James Lopez | 2016-02-16 | 1 | -1/+3 |
| | | | |