summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Use MergeRequestsClosingIssues cache data on Issue#closed_by_merge_requests ↵14192-issues-closed-by-merge-requests-using-metrics-dataPaco Guzman2016-10-201-1/+7
| | | | method
* Merge branch 'ios-tooltips' into 'master' Annabel Dunstone Gray2016-10-193-2/+12
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set webkit-overflow-scrolling to auto for children of body. ## What does this MR do? Fixes weird tooltip layering behavior in iOS Safari. See screenshots and/or the original issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/22816 ## Why was this MR needed? Tooltips were cutoff in Safari. ## Screenshots (if relevant) Before: ![Screen_Shot_2016-10-18_at_7.13.11_PM](/uploads/5558d60b7369a9355f18d34dcc2c179e/Screen_Shot_2016-10-18_at_7.13.11_PM.png) After: ![Screen_Shot_2016-10-18_at_7.13.40_PM](/uploads/ae07002f2f396f135b3078538d5c4ad6/Screen_Shot_2016-10-18_at_7.13.40_PM.png) Also, as part of this fix, I removed applications of `-webkit-overflow-scrolling: auto` in two other places where they're no longer needed. One was the file-holder. I made sure I could reproduce the behavior this was intended to fix, and then made sure this MR still fixed it. Here's the errant behavior: ![2016-10-18_19.00.22](/uploads/0bd3ee3bab44769dfce80c7edaac3248/2016-10-18_19.00.22.gif) Here's what it looks like with this MR: ![2016-10-18_19.00.49](/uploads/e405ded5acdbbbe5e577222c11198691/2016-10-18_19.00.49.gif) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] All builds are passing - [x] 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) - [x] Branch has no merge conflicts with `master` (if it does - 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? See merge request !6962
| * Set webkit-overflow-scrolling to auto for children of body.ios-tooltipsBryce Johnson2016-10-193-2/+12
| |
* | Merge branch '23375-filtering-on-any-label-or-no-label-does-not-work' into ↵Fatih Acet2016-10-191-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Fix 'No label' and 'Any label' filters ## What does this MR do? Returns the `title`as the `id` for `No label`. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Label filters not working as expected ## Screenshots (if relevant) ![2016-10-19_04.58.08](/uploads/3b079bf28299c1155e0243171ac008f6/2016-10-19_04.58.08.gif) ## Does this MR meet the acceptance criteria? - [ ] [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) - [ ] API support added - Tests - [ ] 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) - [ ] 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 it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #23375 See merge request !6974
| * | Return the title for id of 'No label'23375-filtering-on-any-label-or-no-label-does-not-workLuke Bennett2016-10-191-1/+1
| | |
* | | Merge branch 'feature/group-level-labels' into 'master' Douwe Maan2016-10-1956-206/+794
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Avoid touch label links that does not belongs to project when moving itfeature/group-level-labelsDouglas Barbosa Alexandre2016-10-191-15/+42
| | | |
| * | | Remove order by label type on LabelsFinderDouglas Barbosa Alexandre2016-10-192-2/+2
| | | |
| * | | Rename Labels::CreateService to Labels::FindOrCreateServiceDouglas Barbosa Alexandre2016-10-195-5/+5
| | | |
| * | | Add self.project_foreign_key on both Issue and MergeRequestDouglas Barbosa Alexandre2016-10-193-7/+9
| | | |
| * | | Only show label type for projects that belong to a groupDouglas Barbosa Alexandre2016-10-191-2/+3
| | | |
| * | | Disable subscribing to group-level labelsDouglas Barbosa Alexandre2016-10-194-15/+26
| | | |
| * | | 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
| | | |
| * | | Add support to group labels to SlashCommands::InterpretServiceDouglas Barbosa Alexandre2016-10-192-3/+5
| | | |
| * | | Use join instead of subquery on Label.unprioritized scopeDouglas Barbosa Alexandre2016-10-191-1/+8
| | | |
| * | | Warn user deleting a group label affect all projects within the groupDouglas Barbosa Alexandre2016-10-192-1/+8
| | | |
| * | | Use `includes(:priorities)` on Projects::LabelsControllerDouglas Barbosa Alexandre2016-10-191-1/+1
| | | |
| * | | User Labes::CreateService to create labelsDouglas Barbosa Alexandre2016-10-194-11/+7
| | | |
| * | | Add service to create project labelsDouglas Barbosa Alexandre2016-10-191-0/+33
| | | |
| * | | Recreates the label priorities when moving project to another groupDouglas 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-193-8/+6
| | | |
| * | | Reuse LabelsFinder on Banzai::Filter::LabelReferenceFilterDouglas Barbosa Alexandre2016-10-191-4/+14
| | | |
| * | | Return only labels that user have access on IssuableFinder#labelsDouglas Barbosa Alexandre2016-10-192-10/+7
| | | |
| * | | Abstract LabelPriority away into methods on Label modelDouglas Barbosa Alexandre2016-10-192-9/+21
| | | |
| * | | Add label type to group and project labels listsDouglas Barbosa Alexandre2016-10-193-2/+18
| | | |
| * | | Fix issue board related controllers to expose label priority per projectDouglas Barbosa Alexandre2016-10-195-5/+33
| | | |
| * | | 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-192-10/+13
| | | |
| * | | 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 IssuableBaseService#find_or_create_label_idsDouglas Barbosa Alexandre2016-10-191-1/+1
| | | |
| * | | Fix validation to allow updates to description/color of project labelDouglas Barbosa Alexandre2016-10-191-1/+1
| | | |
| * | | Skip update query if label have the same id on Labels::TransferServiceDouglas Barbosa Alexandre2016-10-191-0/+2
| | | |
| * | | Use reverse_merge on Label#issues_count and Label#merge_requests_countDouglas Barbosa Alexandre2016-10-191-2/+2
| | | |
| * | | Remove unnecessary `title.present?` on LabelsFinderDouglas Barbosa Alexandre2016-10-191-1/+1
| | | |
| * | | Use present? instead of presence on Projects::IssuesController#indexDouglas Barbosa Alexandre2016-10-191-1/+1
| | | |
| * | | Move common logic to reference group/project label to Label#to_referenceDouglas Barbosa Alexandre2016-10-193-48/+31
| | | |
| * | | Render all available labels to project on project labels dropdownDouglas Barbosa Alexandre2016-10-191-1/+1
| | | |
| * | | Keep cross project reference logic in GroupLabel#to_referenceDouglas Barbosa Alexandre2016-10-191-2/+14
| | | |
| * | | Fix shared labels filterDouglas Barbosa Alexandre2016-10-191-1/+1
| | | |
| * | | Limit what label fields we expose on Projects::LabelsController#indexDouglas Barbosa Alexandre2016-10-191-1/+1
| | | |
| * | | Limit what label fields we expose on Groups::LabelsController#indexDouglas Barbosa Alexandre2016-10-191-1/+2
| | | |
| * | | Limit what label fields we expose on Dashboard::LabelsController#indexDouglas Barbosa Alexandre2016-10-191-1/+3
| | | |
View Lorry Controller Status