summaryrefslogtreecommitdiff
path: root/app/models
Commit message (Collapse)AuthorAgeFilesLines
* Differentiate the expire from leave eventCallum Dryden2016-10-203-3/+18
| | | | | | | | | | 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 Maan2016-10-1912-65/+201
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ![Group Labels](/uploads/2244c06ad68eae4fb246fb4c81bf8060/2.png) * Project Labels ![Project Labels](/uploads/c5839516d2282b51f7418d9dadbeceb4/1.png) * Expanded references for group labels when moving issue to another project ![Expanded references for group labels when moving issue to another project](/uploads/0c9ab248a8420d4978d59349ae3d42e5/3.png) ## 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
| * Rename Labels::CreateService to Labels::FindOrCreateServiceDouglas Barbosa Alexandre2016-10-191-1/+1
| |
| * Add self.project_foreign_key on both Issue and MergeRequestDouglas Barbosa Alexandre2016-10-193-7/+9
| |
| * Remove unused method Project#all_labelsDouglas Barbosa Alexandre2016-10-191-4/+0
| |
| * Update specs to cope with new label types and prioritiesJames Lopez2016-10-191-0/+4
| | | | | | | | | | | | 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 max number of permitted priorities per project labelDouglas Barbosa Alexandre2016-10-191-2/+2
| |
| * Use join instead of subquery on Label.unprioritized scopeDouglas Barbosa Alexandre2016-10-191-1/+8
| |
| * User Labes::CreateService to create labelsDouglas Barbosa Alexandre2016-10-191-1/+2
| |
| * Fix sorting merge requests by priorityDouglas Barbosa Alexandre2016-10-191-1/+7
| |
| * Use keyword arguments on Sortable#highest_label_priorityDouglas Barbosa Alexandre2016-10-193-8/+19
| |
| * Add subject to group and projects labels which return group/projectDouglas Barbosa Alexandre2016-10-192-0/+4
| |
| * Abstract LabelPriority away into methods on Label modelDouglas Barbosa Alexandre2016-10-191-1/+15
| |
| * Fix issue board related controllers to expose label priority per projectDouglas Barbosa Alexandre2016-10-193-0/+29
| |
| * Fix sorting by label prioritiesDouglas Barbosa Alexandre2016-10-194-4/+18
| |
| * Add restriction to number of permitted priorities per project labelDouglas Barbosa Alexandre2016-10-191-0/+9
| |
| * Add support to group labels prioritization on project levelDouglas Barbosa Alexandre2016-10-191-4/+6
| |
| * Add LabelPriority modelDouglas Barbosa Alexandre2016-10-192-6/+9
| |
| * Remove `::` for method call on Label#text_colorDouglas Barbosa Alexandre2016-10-191-1/+1
| |
| * Remove Issuable#add_labels_by_namesDouglas Barbosa Alexandre2016-10-191-12/+0
| |
| * Remove unused method Issuable#remove_labelsDouglas Barbosa Alexandre2016-10-191-4/+0
| |
| * Fix validation to allow updates to description/color of project labelDouglas Barbosa Alexandre2016-10-191-1/+1
| |
| * Use reverse_merge on Label#issues_count and Label#merge_requests_countDouglas Barbosa Alexandre2016-10-191-2/+2
| |
| * Move common logic to reference group/project label to Label#to_referenceDouglas Barbosa Alexandre2016-10-193-48/+31
| |
| * Keep cross project reference logic in GroupLabel#to_referenceDouglas Barbosa Alexandre2016-10-191-2/+14
| |
| * Use Label.attributes instead of Label.dup when creating label templatesDouglas Barbosa Alexandre2016-10-191-6/+1
| |
| * Reuse LabelsFinder on Issueable#add_labels_by_namesDouglas Barbosa Alexandre2016-10-191-9/+3
| |
| * Reuse LabelsFinder on Banzai::Filter::LabelReferenceFilterDouglas Barbosa Alexandre2016-10-191-0/+4
| |
| * Unfold references for group labels when moving issue to another projectDouglas Barbosa Alexandre2016-10-193-24/+41
| |
| * Fix Issuable#add_labels_by_names to validate if label exists on groupDouglas Barbosa Alexandre2016-10-191-2/+12
| |
| * Validate if project label title does not exist at group levelDouglas Barbosa Alexandre2016-10-192-2/+17
| |
| * Add ProjectLabel modelDouglas Barbosa Alexandre2016-10-193-9/+9
| |
| * Validates uniqueness of title unless label is a templateDouglas Barbosa Alexandre2016-10-191-4/+2
| |
| * List group labels on project labels pageDouglas Barbosa Alexandre2016-10-191-6/+18
| |
| * Allow users to apply group labels on Issues/MRsDouglas Barbosa Alexandre2016-10-191-1/+5
| |
| * Add GroupLabel modelDouglas Barbosa Alexandre2016-10-192-0/+6
| |
* | Merge branch 'issue_828' into 'master' Douwe Maan2016-10-194-5/+15
|\ \ | | | | | | | | | | | | | | | | | | 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_828Felipe Artur2016-10-194-5/+15
| | |
* | | Merge branch 'dont-touch-fs-on-pipeline-save' into 'master' Rémy Coutable2016-10-191-1/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | Keep around commits only on pipeline create ## What does this MR do? Since the pipeline SHA doesn't change, we don't need to update keep arounds every save. ## Why was this MR needed? This is minimal change to fix this: https://gitlab.com/gitlab-org/gitlab-ce/issues/23503 See merge request !6986
| * | Keep around commits only on pipeline createdont-touch-fs-on-pipeline-saveKamil Trzcinski2016-10-191-1/+1
| |/
* | Merge branch '21444-pipeliens-new-mr' into 'master' Fatih Acet2016-10-191-11/+11
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | Add pipelines tab to new MR #### What does this MR do? Adds pipelines tab to new MRs #### Screenshots (if relevant) ![Screen_Shot_2016-10-10_at_10.23.27_AM](/uploads/6c3f8f2be0cf9ba7cc78f6d918307ec0/Screen_Shot_2016-10-10_at_10.23.27_AM.png) ![Screen_Shot_2016-10-11_at_8.59.45_AM](/uploads/e67577d92327eafef6f04073f3d94212/Screen_Shot_2016-10-11_at_8.59.45_AM.png) #### What are the relevant issue numbers? Closes #21444 See merge request !6238
| * Improve code that creates a list of commits for MR21444-pipeliens-new-mrGrzegorz Bizon2016-10-181-2/+3
| |
| * Extend merge request tests for all commits methodGrzegorz Bizon2016-10-181-3/+4
| |
| * Use temporary compare commits when MR not persistedGrzegorz Bizon2016-10-181-11/+9
| |
* | Merge branch '22191-delete-dynamic-envs-mr' into 'master' Rémy Coutable2016-10-193-2/+41
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delete dynamic environments - Adds "close environment" action to a merge request - Adds tabs to environments list - Adds close button to each environment row in environments list - Replaces Destroy button with Close button inside an environment - Adds close button to builds list inside an environment #### Configuration In order to enable stopping environments a valid `.gitlab-ci.yml` syntax has to be used: ``` review: environment: name: review/$app on_stop: stop_review stop_review: script: echo Delete My App when: manual environment: name: review/$app action: stop ``` This MR requires that `stop_review` has to have: `when`, `environment:name` and `environment:action` defined. The next MR after this one will verify that and enforce that these settings are configured. It will also implicitly configure these settings, making it possible to define it like this: ``` review: environment: name: review/$app on_stop: stop_review stop_review: script: echo Delete My App ``` Closes #22191 See merge request !6669
| * \ Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mr22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-182-3/+18
| |\ \
| * | | Add `stop!` to `environment`Kamil Trzcinski2016-10-181-0/+6
| | | |
| * | | Merge remote-tracking branch 'origin/master' into 22191-delete-dynamic-envs-mrKamil Trzcinski2016-10-181-1/+1
| |\ \ \
| * \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Kamil Trzcinski2016-10-171-4/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | 22191-delete-dynamic-envs-mr
| * | | | | Fix environments specsKamil Trzcinski2016-10-171-0/+3
| | | | | |
View Lorry Controller Status