| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Added specs for the various Repository hooksrepository-caching-refactor | Yorick Peterse | 2016-02-25 | 1 | -2/+106 |
| | | |||||
| * | Merge branch 'ci/extend-summary-status-specs' into 'master' | Kamil Trzciński | 2016-02-23 | 1 | -21/+51 |
| |\ | | | | | | | | | | | | | | | | | | | Extend specs for summary build status Additional specs cover a case when one of the builds is running but allowed to fail. Previous implementation returned `running` status, which is wrong. This behavior has been changed in 8.5, this commit adds missing specs. See merge request !2904 | ||||
| | * | Extend specs for summary build statusci/extend-summary-status-specs | Grzegorz Bizon | 2016-02-20 | 1 | -21/+51 |
| | | | | | | | | | | | | | | | Additional specs cover a case when one of the builds is running but allowed to fail. Previous implementation returned `running` status, which is wrong. This behavior has been changed in 8.5, this commit adds missing specs. | ||||
| * | | Merge branch 'fix-autocomplete-spec' into 'master' | Robert Speicher | 2016-02-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | Fix volatile spec. Fixes https://gitlab.com/gitlab-org/gitlab-ee/issues/312. See merge request !206 | ||||
| * | | Ensure we don't check a commit's description for revert message if it has no ↵ | Rémy Coutable | 2016-02-22 | 1 | -0/+34 |
| | | | | | | | | | description | ||||
| * | | Check the HEAD of branch when doing Merge When Succeededimprove-merge-when-succeeded | Kamil Trzcinski | 2016-02-22 | 1 | -0/+16 |
| | | | |||||
| * | | Merge branch 'tasks' into 'master' | Douglas Barbosa Alexandre | 2016-02-22 | 13 | -4/+656 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | Rename Tasks to Todos | Douglas Barbosa Alexandre | 2016-02-20 | 13 | -333/+338 |
| | | | | |||||
| | * | | Create or mark task pending as soon the action happens | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -1/+1 |
| | | | | |||||
| | * | | Ensure that we only have one task per issue/mr | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -18/+16 |
| | | | | |||||
| | * | | Explicit mention of the assignee make a task | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -4/+4 |
| | | | | | | | | | | | | | Since potentially the previous assign-task has already been handled. | ||||
| | * | | Refactoring task queue partials | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -19/+5 |
| | | | | |||||
| | * | | Improve formatted message for tasks when action is a mention | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -1/+7 |
| | | | | |||||
| | * | | Use destroy, in case we ever have before_destroy callbacks on Task | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -1/+1 |
| | | | | |||||
| | * | | Fix task factory | Douglas Barbosa Alexandre | 2016-02-20 | 2 | -2/+5 |
| | | | | |||||
| | * | | Fix rubocop offenses | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -3/+3 |
| | | | | |||||
| | * | | Fix pending examples from task model spec | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -4/+30 |
| | | | | |||||
| | * | | Create a pending task when a user is mentioned when edit a issue/mr/note | Douglas Barbosa Alexandre | 2016-02-20 | 7 | -84/+79 |
| | | | | |||||
| | * | | Does not create a task if new assignee is the current user | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -0/+12 |
| | | | | |||||
| | * | | Create a pending task when a user is mentioned on a note | Douglas Barbosa Alexandre | 2016-02-20 | 3 | -0/+29 |
| | | | | |||||
| | * | | Create a pending task when a user is mentioned on issue/mr | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -30/+66 |
| | | | | |||||
| | * | | Rename TaskService#mark_as_done to mark_pending_tasks_as_done | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -2/+2 |
| | | | | |||||
| | * | | Marks pending tasks for an user as done when he merge the MR | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -0/+17 |
| | | | | |||||
| | * | | Marks pending tasks for an user as done when he close the MR | Douglas Barbosa Alexandre | 2016-02-20 | 2 | -0/+24 |
| | | | | |||||
| | * | | Marks pending tasks for an user as done when he edit a MR | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -1/+54 |
| | | | | |||||
| | * | | Create a pending task when an MR is assigned to someone | Douglas Barbosa Alexandre | 2016-02-20 | 3 | -8/+109 |
| | | | | |||||
| | * | | Mark pending tasks for the current user as done when he edit a note | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -0/+45 |
| | | | | |||||
| | * | | Mark pending tasks for the note author as done when he left a note | Douglas Barbosa Alexandre | 2016-02-20 | 2 | -4/+40 |
| | | | | |||||
| | * | | Marks pending tasks for an user as done when he close the issue | Douglas Barbosa Alexandre | 2016-02-20 | 2 | -0/+25 |
| | | | | |||||
| | * | | Marks pending tasks for an user as done when he edit an issue | Douglas Barbosa Alexandre | 2016-02-20 | 3 | -11/+93 |
| | | | | |||||
| | * | | Add feature spec for task queue list page | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -0/+23 |
| | | | | |||||
| | * | | Does not create a task for new issue when assignee is the current user | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -0/+4 |
| | | | | |||||
| | * | | Create a pending task when an issue is assigned to someone | Douglas Barbosa Alexandre | 2016-02-20 | 3 | -2/+92 |
| | | | | |||||
| | * | | Add tasks queue list page | Douglas Barbosa Alexandre | 2016-02-20 | 1 | -0/+23 |
| | | | | |||||
| | * | | Add task model | Douglas Barbosa Alexandre | 2016-02-20 | 2 | -0/+33 |
| | |/ | |||||
| * | | Merge branch 'merge-when-succeeded' into 'master' | Douwe Maan | 2016-02-22 | 1 | -6/+60 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bugs in MergeWhenSucceeded 1. This fixes support for merge when succeeded for statuses without ref. 2. This fixes support for merge when succeeded for multiple stages. Stages are created after all builds for previous one are finished. Fixes: https://gitlab.com/gitlab-org/gitlab-ce/issues/9060 https://gitlab.com/gitlab-org/gitlab-ce/issues/8108 https://gitlab.com/gitlab-org/gitlab-ce/issues/12931 https://gitlab.com/gitlab-org/gitlab-ce/issues/13269 /cc @grzesiek @DouweM @rspeicher See merge request !2894 | ||||
| | * | | Discover branches for commit statuses ref-less when doing merge when succeededmerge-when-succeeded | Kamil Trzcinski | 2016-02-19 | 1 | -6/+30 |
| | | | | |||||
| | * | | Fix Merge When Succeeded for multiple stages | Kamil Trzcinski | 2016-02-19 | 1 | -0/+30 |
| | | | | | | | | | | | | | Use around_transition to trigger build creation for next stages | ||||
| * | | | Flush emptiness caches whenever needed | Yorick Peterse | 2016-02-20 | 1 | -0/+14 |
| | |/ |/| | | | | | | | | | | | | | | | | | | | | | This ensures that the emptiness cache (used for Repository#empty? and Repository#has_visible_content?) is flushed after comitting changes (using the web editor, API or Git) for new repositories. Once a repository is no longer empty there's no need to explicitly flush the cache for Repository#empty?. The cache for Repository#has_visible_content? in turn is already flushed whenever needed. Fixes gitlab-org/gitlab-ce#13387 | ||||
| * | | Merge branch 'rs-move-controller-specs' into 'master' | Douwe Maan | 2016-02-20 | 5 | -0/+0 |
| |\ \ | | | | | | | | | | | | | | | | | | | Move a few controller specs to their correct locations See merge request !2889 | ||||
| | * | | Move a few controller specs to their correct locationsrs-move-controller-specs | Robert Speicher | 2016-02-18 | 5 | -0/+0 |
| | | | | |||||
| * | | | Merge branch 'rs-blob' into 'master' | Douwe Maan | 2016-02-20 | 1 | -0/+81 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a `Blob` model that wraps `Gitlab::Git::Blob` This allows us to take advantage of Rails' `to_partial_path` to render the correct partial based on the Blob type, rather than cluttering the view with conditionals. It also allows (and will allow in the future) better encapsulation for Blob-related logic which makes sense for our Rails app but might not make as much sense for the core `gitlab_git` library, such as detecting if the blob is an SVG. See merge request !2887 | ||||
| | * | | | Add a `Blob` model that wraps `Gitlab::Git::Blob`rs-blob | Robert Speicher | 2016-02-18 | 1 | -0/+81 |
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows us to take advantage of Rails' `to_partial_path` to render the correct partial based on the Blob type, rather than cluttering the view with conditionals. It also allows (and will allow in the future) better encapsulation for Blob-related logic which makes sense for our Rails app but might not make as much sense for the core `gitlab_git` library, such as detecting if the blob is an SVG. | ||||
| * | | | Merge branch '12792-emoji-as-text-diff-comment' | Douwe Maan | 2016-02-19 | 1 | -2/+10 |
| |\ \ \ | |||||
| | * | | | Improve #set_award! on the Note model12792-emoji-as-text-diff-comment | Zeger-Jan van de Weg | 2016-02-19 | 1 | -1/+4 |
| | | | | | |||||
| | * | | | Emoji reponses on diffs aren't award emoji | Zeger-Jan van de Weg | 2016-02-19 | 1 | -2/+7 |
| | | | | | |||||
| * | | | | Merge branch 'builds-artifacts-API' into 'master' | Kamil Trzciński | 2016-02-19 | 4 | -51/+93 |
| |\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce API for serving the artifacts archive Add API to download build artifacts archive in context of GitLab API /cc @DouweM @grzesiek See merge request !2893 | ||||
| | * | | | Fix ci_build trace trait | Kamil Trzcinski | 2016-02-19 | 3 | -5/+5 |
| | | | | | |||||
| | * | | | Fix specs | Kamil Trzcinski | 2016-02-19 | 2 | -60/+77 |
| | | | | | |||||
| | * | | | Introduce API for serving the artifacts archive | Kamil Trzcinski | 2016-02-19 | 1 | -0/+25 |
| | | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |