Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | Split up adding ancestors for projects | Bob Van Landuyt | 2017-10-04 | 1 | -4/+13 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Fix bug with project pagination | Bob Van Landuyt | 2017-10-04 | 2 | -7/+33 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When projects were listed after groups, the projects that would also have been listed on the last page containing groups would be repeated. | |||||
| * | | | | | | | | | | Stylize `GroupTree` concern | Bob Van Landuyt | 2017-10-04 | 1 | -2/+2 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Improve count queries and move them to contants | Bob Van Landuyt | 2017-10-04 | 1 | -27/+28 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Only preload ancestors for search results in the specified parent | Bob Van Landuyt | 2017-10-04 | 3 | -2/+25 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When filtering we want all to preload all the ancestors upto the specified parent group. - root - subgroup - nested-group - project So when searching 'project', on the 'subgroup' page we want to preload 'nested-group' but not 'subgroup' or 'root' | |||||
| * | | | | | | | | | | Make sure all queries are limited to the page size | Bob Van Landuyt | 2017-10-04 | 2 | -20/+30 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And fix some pagination bugs | |||||
| * | | | | | | | | | | Make sure the user only sees groups he's allowed to see | Bob Van Landuyt | 2017-10-04 | 2 | -2/+40 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Fix nesting bug when rendering children of a shared subgroup | Bob Van Landuyt | 2017-10-04 | 3 | -2/+28 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Minimize the number of queries by preloading counts and ancestors | Bob Van Landuyt | 2017-10-04 | 6 | -71/+110 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By preloading the count of members, projects and subgroups of a group, we don't need to query them later. We also preload the entire hierarchy for a search result and include the counts so we don't need to query for them again | |||||
| * | | | | | | | | | | Rename hierarchies to descendants where applicable | Bob Van Landuyt | 2017-10-04 | 3 | -30/+30 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Keep the `parent` method in `Project` | Bob Van Landuyt | 2017-10-04 | 2 | -8/+4 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Don't wrap arrays twice: `children` are already wrapped in an array | Bob Van Landuyt | 2017-10-04 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We do the wrapping in an array in represent_hierarchy for children. | |||||
| * | | | | | | | | | | Only take unarchived projects into account | Bob Van Landuyt | 2017-10-04 | 2 | -2/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When finding children for a group | |||||
| * | | | | | | | | | | Improve number of queries | Bob Van Landuyt | 2017-10-04 | 2 | -26/+26 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And document what extra queries are still being performed. | |||||
| * | | | | | | | | | | Rename `GroupHierarchy` to `GroupDescendant` | Bob Van Landuyt | 2017-10-04 | 9 | -34/+59 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | More descriptive method names for projects & groups | Bob Van Landuyt | 2017-10-04 | 1 | -5/+5 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | `current_user:` as a keyword argument | Bob Van Landuyt | 2017-10-04 | 4 | -4/+9 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Setup children in a a method and reuse for both calls | Bob Van Landuyt | 2017-10-04 | 1 | -4/+7 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Include pagination when rendering expanded hierarchies | Bob Van Landuyt | 2017-10-04 | 3 | -17/+33 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | [WIP] improve number of queries when rendering a hierarchy | Bob Van Landuyt | 2017-10-04 | 2 | -15/+22 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Search subgroups on dashboard and explore views | Bob Van Landuyt | 2017-10-04 | 3 | -5/+31 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Reuse the groups tree for explore and dashboard. | Bob Van Landuyt | 2017-10-04 | 9 | -104/+200 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Use the default sort set by the `Sortable` concern | Bob Van Landuyt | 2017-10-04 | 1 | -3/+1 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Replace `full_path`, `path` & `web_url` with a single `relative_path` | Bob Van Landuyt | 2017-10-04 | 2 | -5/+11 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Only show root groups on the dashboard | Bob Van Landuyt | 2017-10-04 | 2 | -14/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The children are lazy-loaded when expanding | |||||
| * | | | | | | | | | | Handle all cases for merging a hierarchy | Bob Van Landuyt | 2017-10-04 | 2 | -12/+43 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The possible cases are: - [Array, Array] - [Array, Hash] - [Array, GroupHierarchy] - [Hash,Hash] - [Hash, GroupHierarchy] - [GroupHierarchy, GroupHierarchy] | |||||
| * | | | | | | | | | | Use same response-body in groups-dashboard as we do for group-home | Bob Van Landuyt | 2017-10-04 | 4 | -7/+52 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Don't use canonical path for group children | Bob Van Landuyt | 2017-10-04 | 1 | -3/+4 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Include `can_leave` for a group | Bob Van Landuyt | 2017-10-04 | 2 | -1/+15 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Don't include the parent in search results if it matches | Bob Van Landuyt | 2017-10-04 | 2 | -1/+7 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Limit the amount of queries per row | Bob Van Landuyt | 2017-10-04 | 3 | -13/+84 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Handle case where 2 matches in the same tree are found | Bob Van Landuyt | 2017-10-04 | 3 | -5/+14 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Allow filtering children for a group | Bob Van Landuyt | 2017-10-04 | 4 | -12/+89 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When fetching children for a group with a filter, we will search all nested groups for results and render them in an expanded tree | |||||
| * | | | | | | | | | | Merge group hierarchies when parents are shared | Bob Van Landuyt | 2017-10-04 | 8 | -4/+199 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Don't break when building unions on empty collections | Bob Van Landuyt | 2017-10-04 | 2 | -1/+12 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Add a concern to build hierarchies of groups | Bob Van Landuyt | 2017-10-04 | 4 | -0/+90 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Find all children matching a query | Bob Van Landuyt | 2017-10-04 | 2 | -7/+48 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Add pagination for children | Bob Van Landuyt | 2017-10-04 | 2 | -1/+19 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Update `children` route to handle projects and groups | Bob Van Landuyt | 2017-10-04 | 5 | -31/+77 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Render group children using the same entity | Bob Van Landuyt | 2017-10-04 | 2 | -7/+138 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Add serializer for group children | Bob Van Landuyt | 2017-10-04 | 4 | -0/+55 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Remove the subgroups path on a group | Bob Van Landuyt | 2017-10-04 | 5 | -39/+10 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Fetch children using new finder for the `show` of a group. | Bob Van Landuyt | 2017-10-04 | 6 | -29/+32 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Add a `WithPagination` concern to reuse across serializers | Bob Van Landuyt | 2017-10-04 | 5 | -34/+27 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Add a separate finder for collecting children of groups | Bob Van Landuyt | 2017-10-04 | 2 | -0/+125 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'sprite-icon-class' into 'master'convert-js-modules | Phil Hughes | 2017-10-17 | 2 | -2/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add ability to pass class name to spriteIcon helper Closes #39079 See merge request gitlab-org/gitlab-ce!14855 | |||||
| * | | | | | | | | | | Add ability to pass class name to spriteIcon helpersprite-icon-class | Clement Ho | 2017-10-12 | 2 | -2/+10 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge branch 'patch-29' into 'master' | Rémy Coutable | 2017-10-16 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix link to "Job Permissions" See merge request gitlab-org/gitlab-ce!14896 | |||||
| * | | | | | | | | | | | Fix link to "Job Permissions" | Willi Rath | 2017-10-16 | 1 | -1/+1 | |
| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch '37978-extra-border-radius-while-editing-a-file' into 'master' | Annabel Dunstone Gray | 2017-10-16 | 5 | -2/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove extra border radius when editing a file Closes #37978 See merge request gitlab-org/gitlab-ce!14803 |