| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Update gl_field_error tests for better input filtering.scope-input-errors | Bryce Johnson | 2016-10-20 | 1 | -2/+2 |
| | | |||||
| * | Differentiate the expire from leave event | Callum Dryden | 2016-10-20 | 5 | -0/+129 |
| | | | | | | | | | | | At the moment we cannot see weather a user left a project due to their membership expiring of if they themselves opted to leave the project. This adds a new event type that allows us to make this differentiation. Note that is not really feasable to go back and reliably fix up the previous events. As a result the events for previous expire removals will remain the same however events of this nature going forward will be correctly represented. | ||||
| * | Merge branch 'feature/group-level-labels' into 'master' | Douwe Maan | 2016-10-19 | 32 | -156/+874 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add group level labels ## What does this MR do? Add group level labels. ## Are there points in the code the reviewer needs to double check? * `LabelsFinder` * `Gitlab::Gfm::ReferenceRewriter` * `Banzai::Filter::LabelReferenceFilter` ## Why was this MR needed? We'll be adding more feature that allow you to do cross-project management of issues. ## Screenshots (if relevant) * Group Labels  * Project Labels  * Expanded references for group labels when moving issue to another project  ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [x] API support added - Tests - [x] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? #19997 See merge request !6425 | ||||
| | * | Avoid touch label links that does not belongs to project when moving itfeature/group-level-labels | Douglas Barbosa Alexandre | 2016-10-19 | 1 | -12/+17 |
| | | | |||||
| | * | Rename Labels::CreateService to Labels::FindOrCreateService | Douglas Barbosa Alexandre | 2016-10-19 | 1 | -1/+1 |
| | | | |||||
| | * | Update specs to cope with new label types and priorities | James Lopez | 2016-10-19 | 6 | -9/+51 |
| | | | | | | | | | | | | | Fixed all related specs and also changed the logic to handle edge cases. This includes exporting and exporting of group labels, which will get associated with the new group (if any) or they will become normal project labels otherwise. Found other issues to do with not being able to import all labels at once in the beginning of the JSON - code was much simpler when we import all labels and milestones associated to a project first, then the associations will find the already created labels instead of creating them from the associations themselves. | ||||
| | * | Fix GitHub importer spec | Douglas Barbosa Alexandre | 2016-10-19 | 1 | -1/+1 |
| | | | |||||
| | * | Add service to create project labels | Douglas Barbosa Alexandre | 2016-10-19 | 1 | -0/+51 |
| | | | |||||
| | * | Recreates the label priorities when moving project to another group | Douglas Barbosa Alexandre | 2016-10-19 | 1 | -0/+10 |
| | | | |||||
| | * | Add subject to group and projects labels which return group/project | Douglas Barbosa Alexandre | 2016-10-19 | 2 | -0/+16 |
| | | | |||||
| | * | Abstract LabelPriority away into methods on Label model | Douglas Barbosa Alexandre | 2016-10-19 | 1 | -0/+58 |
| | | | |||||
| | * | Fix issue board related controllers to expose label priority per project | Douglas Barbosa Alexandre | 2016-10-19 | 1 | -1/+1 |
| | | | |||||
| | * | Fix sorting by label priorities | Douglas Barbosa Alexandre | 2016-10-19 | 2 | -12/+29 |
| | | | |||||
| | * | Add restriction to number of permitted priorities per project label | Douglas Barbosa Alexandre | 2016-10-19 | 1 | -1/+12 |
| | | | |||||
| | * | Add support to group labels prioritization on project level | Douglas Barbosa Alexandre | 2016-10-19 | 2 | -5/+4 |
| | | | |||||
| | * | Add LabelPriority model | Douglas Barbosa Alexandre | 2016-10-19 | 3 | -0/+29 |
| | | | |||||
| | * | List all available labels to the project on the labels API | Douglas Barbosa Alexandre | 2016-10-19 | 1 | -3/+9 |
| | | | |||||
| | * | Add support to group labels on issues board API | Douglas Barbosa Alexandre | 2016-10-19 | 1 | -8/+17 |
| | | | |||||
| | * | Fix validation to allow updates to description/color of project label | Douglas Barbosa Alexandre | 2016-10-19 | 1 | -0/+10 |
| | | | |||||
| | * | Reuse LabelsFinder on Issueable#add_labels_by_names | Douglas Barbosa Alexandre | 2016-10-19 | 1 | -3/+4 |
| | | | |||||
| | * | fix rubocop warning | James Lopez | 2016-10-19 | 1 | -2/+4 |
| | | | |||||
| | * | Fix import/export labels to cope with project and group labels. Added ↵ | James Lopez | 2016-10-19 | 3 | -6/+66 |
| | | | | | | | | | relevant specs. | ||||
| | * | Fix import test | James Lopez | 2016-10-19 | 1 | -0/+0 |
| | | | |||||
| | * | Remove scopes/types for labels | Douglas Barbosa Alexandre | 2016-10-19 | 2 | -37/+11 |
| | | | |||||
| | * | Unfold references for group labels when moving issue to another project | Douglas Barbosa Alexandre | 2016-10-19 | 5 | -49/+179 |
| | | | |||||
| | * | Update project test file for project import integration test | Douglas Barbosa Alexandre | 2016-10-19 | 1 | -0/+0 |
| | | | |||||
| | * | Add tests to LabelsFinder | Douglas Barbosa Alexandre | 2016-10-19 | 1 | -0/+69 |
| | | | |||||
| | * | Add Label attributes: type, and group_id to safe model attributes | Douglas Barbosa Alexandre | 2016-10-19 | 1 | -0/+2 |
| | | | |||||
| | * | Fix LabelsHelper#link_to_label to use the subject argument | Douglas Barbosa Alexandre | 2016-10-19 | 1 | -14/+13 |
| | | | |||||
| | * | Recreates missing group labels when moving project to another group | Douglas Barbosa Alexandre | 2016-10-19 | 3 | -0/+61 |
| | | | |||||
| | * | Validate if project label title does not exist at group level | Douglas Barbosa Alexandre | 2016-10-19 | 3 | -1/+41 |
| | | | |||||
| | * | Add ProjectLabel model | Douglas Barbosa Alexandre | 2016-10-19 | 4 | -30/+37 |
| | | | |||||
| | * | Remove project_labels from Projects::ApplicationController | Douglas Barbosa Alexandre | 2016-10-19 | 1 | -20/+60 |
| | | | |||||
| | * | Validates uniqueness of title unless label is a template | Douglas Barbosa Alexandre | 2016-10-19 | 1 | -0/+1 |
| | | | |||||
| | * | List group labels on project labels page | Douglas Barbosa Alexandre | 2016-10-19 | 1 | -38/+66 |
| | | | |||||
| | * | Allow user to create a board list based on a group label | Douglas Barbosa Alexandre | 2016-10-19 | 2 | -0/+8 |
| | | | |||||
| | * | Allow users to apply group labels on Issues/MRs | Douglas Barbosa Alexandre | 2016-10-19 | 1 | -0/+21 |
| | | | |||||
| | * | Add GroupLabel model | Douglas Barbosa Alexandre | 2016-10-19 | 2 | -0/+12 |
| | | | |||||
| * | | Merge branch 'dz-refactor-project-members-controller-spec' into 'master' | Sean McGivern | 2016-10-19 | 2 | -119/+77 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Refactor project_members_controller_spec Make tests more readable, DRY and closer to RSpec best practices. Same as https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6985 but for project_members_controller_spec now See merge request !6989 | ||||
| | * | | Change the order of tested methods in project_members_controller_spec | Dmitriy Zaporozhets | 2016-10-19 | 1 | -44/+44 |
| | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | Refactor project_members_controller_specdz-refactor-project-members-controller-spec | Dmitriy Zaporozhets | 2016-10-19 | 2 | -78/+36 |
| | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | Merge branch 'issue_828' into 'master' | Douwe Maan | 2016-10-19 | 8 | -63/+145 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Prevent wrong markdown on issue ids when project has Jira service activated fixes gitlab-org/gitlab-ee#828 See merge request !6728 | ||||
| | * | | | Prevent wrong markdown on issue ids when project has Jira service activatedissue_828 | Felipe Artur | 2016-10-19 | 8 | -63/+145 |
| | | | | | |||||
| * | | | | Merge branch ↵ | Robert Speicher | 2016-10-19 | 1 | -0/+8 |
| |\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '22457-reset-filters-button-should-be-invisible-when-no-filters-are-active' into 'master' `Reset filters` link should only be visible when filters are active ## Why was this MR needed? `Reset filters` link is always visible. Closes #22457 See merge request !6497 | ||||
| | * | | | Added `issuable_filters_present` to check for active filters before ↵22457-reset-filters-button-should-be-invisible-when-no-filters-are-active | Luke Bennett | 2016-10-07 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | rendering the reset button Added tests | ||||
| * | | | | Merge branch '21444-pipeliens-new-mr' into 'master' | Fatih Acet | 2016-10-19 | 1 | -17/+41 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add pipelines tab to new MR #### What does this MR do? Adds pipelines tab to new MRs #### Screenshots (if relevant)   #### What are the relevant issue numbers? Closes #21444 See merge request !6238 | ||||
| | * | | | | Extend merge request tests for all commits method | Grzegorz Bizon | 2016-10-18 | 1 | -17/+41 |
| | | | | | | |||||
| * | | | | | Merge branch 'fix-escaping' into 'master' | Sean McGivern | 2016-10-19 | 1 | -0/+5 |
| |\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | fix: commit messages being double-escaped in activities tab See merge request !6937 | ||||
| | * | | | | fix: commit messages being double-escaped in activies tab | amaia | 2016-10-18 | 1 | -0/+5 |
| | | | | | | |||||
| * | | | | | Merge branch 'dz-refactor-some-specs' into 'master' | Sean McGivern | 2016-10-19 | 2 | -86/+35 |
| |\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | Refactor group_members_controller_spec Make tests more readable, DRY and closer to RSpec best practices. See merge request !6985 | ||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |