Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | Merge branch '38156-breadcrumbs-margin' into 'master' | Tim Zallmann | 2017-10-17 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Use variable for mobile breadcrumbs padding38156-breadcrumbs-margin | Annabel Dunstone Gray | 2017-10-16 | 1 | -1/+1 | |
| | |_|_|_|_|_|/ / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge branch 'prevent-creating-multiple-application-settings' into 'master' | Yorick Peterse | 2017-10-17 | 3 | -0/+17 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Prevent creating multiple ApplicationSetting by forcing it to always have id=1prevent-creating-multiple-application-settings | Kamil Trzcinski | 2017-10-16 | 3 | -0/+17 | |
* | | | | | | | | | | Merge branch '39181-gitlab-backgroundmigration-deserializemergerequestdiffsan... | Rémy Coutable | 2017-10-17 | 2 | -2/+20 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Handle null serialised commits in background migration39181-gitlab-backgroundmigration-deserializemergerequestdiffsandcommits-error-nomethoderror-undefined-method-map-for-nil-nilclass | Sean McGivern | 2017-10-17 | 2 | -2/+20 | |
* | | | | | | | | | | | Merge branch 'fl-gke-collapsible-containers' into 'master' | Phil Hughes | 2017-10-17 | 4 | -44/+67 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Adds collapsible sections in cluster page | Filipa Lacerda | 2017-10-17 | 4 | -44/+67 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge branch 'zj-gitaly-n-1-call-test' into 'master' | Douwe Maan | 2017-10-17 | 2 | -14/+42 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Update gitaly.md | Zeger-Jan van de Weg | 2017-10-17 | 1 | -2/+4 | |
| * | | | | | | | | | | Update documentation | Zeger-Jan van de Weg | 2017-10-17 | 1 | -15/+3 | |
| * | | | | | | | | | | Allow testing on Gitaly call count | Zeger-Jan van de Weg | 2017-10-16 | 2 | -14/+52 | |
| | |/ / / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'fix/github-doc' into 'master' | Rémy Coutable | 2017-10-17 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | clarify resuming importfix/github-doc | James Lopez | 2017-10-17 | 1 | -0/+1 | |
| | |_|/ / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge branch 'bump-git-2-13-6' into 'master' | Rémy Coutable | 2017-10-17 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Bump Git version to 2.13.6bump-git-2-13-6 | Balasankar C | 2017-10-17 | 1 | -1/+1 | |
* | | | | | | | | | | Merge branch 'bvl-circuitbreaker-improvements' into 'master' | Douwe Maan | 2017-10-17 | 21 | -127/+212 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Allow configuring the circuitbreaker through the API and UI | Bob Van Landuyt | 2017-10-17 | 8 | -25/+100 | |
| * | | | | | | | | | | Read circuitbreaker settings from `Gitlab::CurrentSettings` | Bob Van Landuyt | 2017-10-17 | 11 | -106/+80 | |
| * | | | | | | | | | | Add existing circuitbreaker settings to the database | Bob Van Landuyt | 2017-10-17 | 3 | -1/+37 | |
* | | | | | | | | | | | Merge branch 'bvl-group-trees' into 'master' | Douwe Maan | 2017-10-17 | 99 | -1183/+5069 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Preserve `archived` param only when sort order is changedbvl-group-trees | kushalpandya | 2017-10-13 | 1 | -3/+3 | |
| * | | | | | | | | | | | Make sure we always return an array of hierarchies | Bob Van Landuyt | 2017-10-13 | 3 | -1/+21 | |
| * | | | | | | | | | | | Remove unnecessary `Flash` import | kushalpandya | 2017-10-13 | 1 | -1/+0 | |
| * | | | | | | | | | | | Add `archived` related options in sort dropdown | kushalpandya | 2017-10-13 | 3 | -14/+47 | |
| * | | | | | | | | | | | Add support for `archived` param | kushalpandya | 2017-10-13 | 6 | -10/+22 | |
| * | | | | | | | | | | | Update preloaded count queries for MySQL | Bob Van Landuyt | 2017-10-12 | 1 | -3/+3 | |
| * | | | | | | | | | | | Skip some nested group specs when using MySQL | Bob Van Landuyt | 2017-10-12 | 2 | -6/+16 | |
| * | | | | | | | | | | | Nest the group_children_path inside the canonical group path | Bob Van Landuyt | 2017-10-12 | 5 | -306/+318 | |
| * | | | | | | | | | | | Use Arel to build preloaded counts | Bob Van Landuyt | 2017-10-12 | 1 | -48/+45 | |
| * | | | | | | | | | | | Pass `archived:` as a keyword argument | Bob Van Landuyt | 2017-10-12 | 4 | -8/+8 | |
| * | | | | | | | | | | | Use polymorphism for common attributes in `GroupChildEntity` | Bob Van Landuyt | 2017-10-12 | 2 | -17/+22 | |
| * | | | | | | | | | | | Fix spinach features | Bob Van Landuyt | 2017-10-11 | 6 | -5/+13 | |
| * | | | | | | | | | | | Always use the same order specs for `MultiCollectionPaginator` | Bob Van Landuyt | 2017-10-11 | 1 | -1/+1 | |
| * | | | | | | | | | | | Handle archived projects in the `GroupDescendantsFinder` | Bob Van Landuyt | 2017-10-11 | 4 | -26/+108 | |
| * | | | | | | | | | | | Add a text to the leave group confirmation | Bob Van Landuyt | 2017-10-10 | 1 | -0/+1 | |
| * | | | | | | | | | | | Merge branch 'master' into bvl-group-trees | Bob Van Landuyt | 2017-10-10 | 1038 | -5839/+21076 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | | Use the `GroupProjectsFinder` to find direct children | Bob Van Landuyt | 2017-10-10 | 1 | -4/+5 | |
| * | | | | | | | | | | | Don't preload all memberships for a user | Bob Van Landuyt | 2017-10-10 | 2 | -10/+1 | |
| * | | | | | | | | | | | Adjust wording on the Group-show page | Bob Van Landuyt | 2017-10-10 | 2 | -13/+168 | |
| * | | | | | | | | | | | Reuse `base_and_ancestors` for `ancestors` in `GroupHierarchy` | Bob Van Landuyt | 2017-10-10 | 1 | -2/+1 | |
| * | | | | | | | | | | | Return `self` from `GroupChildSerializer#expand_hierarchy` | Bob Van Landuyt | 2017-10-10 | 1 | -5/+5 | |
| * | | | | | | | | | | | Move the `ancestors_upto` to `Project` and `Namespace` | Bob Van Landuyt | 2017-10-10 | 5 | -10/+54 | |
| * | | | | | | | | | | | Some cleanup in the GroupDescendantFinder | Bob Van Landuyt | 2017-10-10 | 1 | -8/+5 | |
| * | | | | | | | | | | | Don't load unneeded elements in GroupsController#show | Bob Van Landuyt | 2017-10-10 | 5 | -70/+68 | |
| * | | | | | | | | | | | Use `GroupFinder` to check if a user can read a group | Bob Van Landuyt | 2017-10-10 | 1 | -2/+4 | |
| * | | | | | | | | | | | Use `EXISTS` instead of `WHERE id IN (...)` for authorized groups | Bob Van Landuyt | 2017-10-10 | 2 | -18/+25 | |
| * | | | | | | | | | | | Only expand ancestors when searching | Bob Van Landuyt | 2017-10-09 | 2 | -8/+19 | |
| * | | | | | | | | | | | Render droplab button only if Subgroups feature is supported | kushalpandya | 2017-10-05 | 1 | -12/+13 | |
| * | | | | | | | | | | | Add new subgroup/project droplab button initialization on Group homepage | kushalpandya | 2017-10-05 | 1 | -0/+6 |