Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-10-20Merge branch 'ios-tooltips' into 'master' Annabel Dunstone Gray
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
2016-10-20Merge branch '23375-filtering-on-any-label-or-no-label-does-not-work' into ↵Fatih Acet
'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
2016-10-19Merge branch 'feature/group-level-labels' into 'master' Douwe Maan
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
2016-10-19Merge branch 'dropdowns-should-drop-down' into 'master' Jacob Schatz
Remove show_menu_above attribute from issuable dropdowns. Removes `show_menu_above` attribute form issueable dropdowns so they will drop down. Fixes #23425 and #23317 See merge request !7001
2016-10-19Merge branch 'dz-refactor-project-members-controller-spec' into 'master' Sean McGivern
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
2016-10-19Merge branch 'adam-fix-ruby-2-1-cycle-analytics' into 'master' Douwe Maan
Use Hash rocket syntax to fix cycle analytics under Ruby 2.1 Refers to #23510 See merge request !6977
2016-10-19Use LabelsFinder on Fogbuz importerDouglas Barbosa Alexandre
2016-10-19Use LabelsFinder on Google Code importerDouglas Barbosa Alexandre
2016-10-19Merge branch 'dz-start-8-14' into 'master' Dmitriy Zaporozhets
Its time for 8.14 in master See merge request !6998
2016-10-19Change the order of tested methods in project_members_controller_specDmitriy Zaporozhets
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
2016-10-19Remove show_menu_above attribute from issuable dropdowns.Fatih Acet
2016-10-19Merge branch 'issue_828' into 'master' Douwe Maan
Prevent wrong markdown on issue ids when project has Jira service activated fixes gitlab-org/gitlab-ee#828 See merge request !6728
2016-10-19Merge branch 'update-omniauth-saml' into 'master' Douwe Maan
Bump `omniauth-saml` to 1.7.0 Bump `omniauth-saml` to 1.7.0 to include security fixes and metadata support for IdP auto-configuration. cc @dblessing @dewetblomerus See merge request !6997
2016-10-19Merge branch ↵Robert Speicher
'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
2016-10-19Spaces before `}`!Douwe Maan
2016-10-19Avoid touch label links that does not belongs to project when moving itDouglas Barbosa Alexandre
2016-10-19Remove order by label type on LabelsFinderDouglas Barbosa Alexandre
2016-10-19Rename Labels::CreateService to Labels::FindOrCreateServiceDouglas Barbosa Alexandre
2016-10-19Add self.project_foreign_key on both Issue and MergeRequestDouglas Barbosa Alexandre
2016-10-19Only show label type for projects that belong to a groupDouglas Barbosa Alexandre
2016-10-19Disable subscribing to group-level labelsDouglas Barbosa Alexandre
2016-10-19Remove unused method Project#all_labelsDouglas Barbosa Alexandre
2016-10-19Update specs to cope with new label types and prioritiesJames Lopez
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.
2016-10-19Fix max number of permitted priorities per project labelDouglas Barbosa Alexandre
2016-10-19Fix GitHub importer specDouglas Barbosa Alexandre
2016-10-19Update CHANGELOGDouglas Barbosa Alexandre
2016-10-19Add support to group labels to SlashCommands::InterpretServiceDouglas Barbosa Alexandre
2016-10-19Use join instead of subquery on Label.unprioritized scopeDouglas Barbosa Alexandre
2016-10-19Warn user deleting a group label affect all projects within the groupDouglas Barbosa Alexandre
2016-10-19Use `includes(:priorities)` on Projects::LabelsControllerDouglas Barbosa Alexandre
2016-10-19Split migration to create label prioritiesDouglas Barbosa Alexandre
2016-10-19User Labes::CreateService to create labelsDouglas Barbosa Alexandre
2016-10-19Add service to create project labelsDouglas Barbosa Alexandre
2016-10-19Recreates the label priorities when moving project to another groupDouglas Barbosa Alexandre
2016-10-19Fix sorting merge requests by priorityDouglas Barbosa Alexandre
2016-10-19Use keyword arguments on Sortable#highest_label_priorityDouglas Barbosa Alexandre
2016-10-19Add subject to group and projects labels which return group/projectDouglas Barbosa Alexandre
2016-10-19Reuse LabelsFinder on Banzai::Filter::LabelReferenceFilterDouglas Barbosa Alexandre
2016-10-19Return only labels that user have access on IssuableFinder#labelsDouglas Barbosa Alexandre
2016-10-19Abstract LabelPriority away into methods on Label modelDouglas Barbosa Alexandre
2016-10-19Add label type to group and project labels listsDouglas Barbosa Alexandre
2016-10-19Fix project issues labels feature specDouglas Barbosa Alexandre
2016-10-19Fix issue board related controllers to expose label priority per projectDouglas Barbosa Alexandre
2016-10-19Fix sorting by label prioritiesDouglas Barbosa Alexandre
2016-10-19Add restriction to number of permitted priorities per project labelDouglas Barbosa Alexandre
2016-10-19Add support to group labels prioritization on project levelDouglas Barbosa Alexandre
2016-10-19Add LabelPriority modelDouglas Barbosa Alexandre
2016-10-19Remove `::` for method call on Label#text_colorDouglas Barbosa Alexandre
2016-10-19Remove Issuable#add_labels_by_namesDouglas Barbosa Alexandre
2016-10-19Remove unused method Issuable#remove_labelsDouglas Barbosa Alexandre