summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Animate auto devops graphicanimate-auto-devopsClement Ho2017-10-183-2/+18
|
* Merge branch ↵Rémy Coutable2017-10-172-2/+20
|\ | | | | | | | | | | | | | | | | '39181-gitlab-backgroundmigration-deserializemergerequestdiffsandcommits-error-nomethoderror-undefined-method-map-for-nil-nilclass' into 'master' Resolve "Gitlab::BackgroundMigration::DeserializeMergeRequestDiffsAndCommits::Error: #<NoMethodError: undefined method `map' for nil:NilClass" Closes #39181 See merge request gitlab-org/gitlab-ce!14907
| * Handle null serialised commits in background migration39181-gitlab-backgroundmigration-deserializemergerequestdiffsandcommits-error-nomethoderror-undefined-method-map-for-nil-nilclassSean McGivern2017-10-172-2/+20
| | | | | | | | This is already handled for diffs, but not commits.
* | Merge branch 'fl-gke-collapsible-containers' into 'master'Phil Hughes2017-10-174-44/+67
|\ \ | | | | | | | | | | | | Adds collapsible sections in cluster page See merge request gitlab-org/gitlab-ce!14890
| * | Adds collapsible sections in cluster pageFilipa Lacerda2017-10-174-44/+67
|/ /
* | Merge branch 'zj-gitaly-n-1-call-test' into 'master'Douwe Maan2017-10-172-14/+42
|\ \ | | | | | | | | | | | | Allow testing on Gitaly call count See merge request gitlab-org/gitlab-ce!14837
| * | Update gitaly.mdZeger-Jan van de Weg2017-10-171-2/+4
| | |
| * | Update documentationZeger-Jan van de Weg2017-10-171-15/+3
| | |
| * | Allow testing on Gitaly call countZeger-Jan van de Weg2017-10-162-14/+52
| | | | | | | | | | | | | | | Previous efforts were aimed at detecting N + 1 queries, general regressions are hard to find and mitigate.
* | | Merge branch 'fix/github-doc' into 'master'Rémy Coutable2017-10-171-0/+1
|\ \ \ | | | | | | | | | | | | | | | | Clarify how to resume GitHub import on docs See merge request gitlab-org/gitlab-ce!14905
| * | | clarify resuming importfix/github-docJames Lopez2017-10-171-0/+1
| | | |
* | | | Merge branch 'bump-git-2-13-6' into 'master'Rémy Coutable2017-10-171-1/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | Bump Git version to 2.13.6 See merge request gitlab-org/gitlab-ce!14906
| * | | Bump Git version to 2.13.6bump-git-2-13-6Balasankar C2017-10-171-1/+1
| | | |
* | | | Merge branch 'bvl-circuitbreaker-improvements' into 'master'Douwe Maan2017-10-1721-127/+212
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Make the circuitbreaker configurable at runtime See merge request gitlab-org/gitlab-ce!14842
| * | | | Allow configuring the circuitbreaker through the API and UIBob Van Landuyt2017-10-178-25/+100
| | | | |
| * | | | Read circuitbreaker settings from `Gitlab::CurrentSettings`Bob Van Landuyt2017-10-1711-106/+80
| | | | | | | | | | | | | | | | | | | | Instead of from the configuration file
| * | | | Add existing circuitbreaker settings to the databaseBob Van Landuyt2017-10-173-1/+37
| | | | |
* | | | | Merge branch 'bvl-group-trees' into 'master'Douwe Maan2017-10-1799-1183/+5069
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show collapsible tree on the project show page Closes #30343 See merge request gitlab-org/gitlab-ce!14055
| * | | | | Preserve `archived` param only when sort order is changedbvl-group-treeskushalpandya2017-10-131-3/+3
| | | | | |
| * | | | | Make sure we always return an array of hierarchiesBob Van Landuyt2017-10-133-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | Even when we pass an array of only a single object
| * | | | | Remove unnecessary `Flash` importkushalpandya2017-10-131-1/+0
| | | | | |
| * | | | | Add `archived` related options in sort dropdownkushalpandya2017-10-133-14/+47
| | | | | |
| * | | | | Add support for `archived` paramkushalpandya2017-10-136-10/+22
| | | | | |
| * | | | | Update preloaded count queries for MySQLBob Van Landuyt2017-10-121-3/+3
| | | | | |
| * | | | | Skip some nested group specs when using MySQLBob Van Landuyt2017-10-122-6/+16
| | | | | |
| * | | | | Nest the group_children_path inside the canonical group pathBob Van Landuyt2017-10-125-306/+318
| | | | | |
| * | | | | Use Arel to build preloaded countsBob Van Landuyt2017-10-121-48/+45
| | | | | |
| * | | | | Pass `archived:` as a keyword argumentBob Van Landuyt2017-10-124-8/+8
| | | | | |
| * | | | | Use polymorphism for common attributes in `GroupChildEntity`Bob Van Landuyt2017-10-122-17/+22
| | | | | |
| * | | | | Fix spinach featuresBob Van Landuyt2017-10-116-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | And several other failures
| * | | | | Always use the same order specs for `MultiCollectionPaginator`Bob Van Landuyt2017-10-111-1/+1
| | | | | |
| * | | | | Handle archived projects in the `GroupDescendantsFinder`Bob Van Landuyt2017-10-114-26/+108
| | | | | |
| * | | | | Add a text to the leave group confirmationBob Van Landuyt2017-10-101-0/+1
| | | | | |
| * | | | | Merge branch 'master' into bvl-group-treesBob Van Landuyt2017-10-101038-5839/+21076
| |\ \ \ \ \
| * | | | | | Use the `GroupProjectsFinder` to find direct childrenBob Van Landuyt2017-10-101-4/+5
| | | | | | |
| * | | | | | Don't preload all memberships for a userBob Van Landuyt2017-10-102-10/+1
| | | | | | |
| * | | | | | Adjust wording on the Group-show pageBob Van Landuyt2017-10-102-13/+168
| | | | | | |
| * | | | | | Reuse `base_and_ancestors` for `ancestors` in `GroupHierarchy`Bob Van Landuyt2017-10-101-2/+1
| | | | | | |
| * | | | | | Return `self` from `GroupChildSerializer#expand_hierarchy`Bob Van Landuyt2017-10-101-5/+5
| | | | | | |
| * | | | | | Move the `ancestors_upto` to `Project` and `Namespace`Bob Van Landuyt2017-10-105-10/+54
| | | | | | |
| * | | | | | Some cleanup in the GroupDescendantFinderBob Van Landuyt2017-10-101-8/+5
| | | | | | |
| * | | | | | Don't load unneeded elements in GroupsController#showBob Van Landuyt2017-10-105-70/+68
| | | | | | |
| * | | | | | Use `GroupFinder` to check if a user can read a groupBob Van Landuyt2017-10-101-2/+4
| | | | | | |
| * | | | | | Use `EXISTS` instead of `WHERE id IN (...)` for authorized groupsBob Van Landuyt2017-10-102-18/+25
| | | | | | |
| * | | | | | Only expand ancestors when searchingBob Van Landuyt2017-10-092-8/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not all_groups, since that would expose groups the user does not have access to
| * | | | | | Render droplab button only if Subgroups feature is supportedkushalpandya2017-10-051-12/+13
| | | | | | |
| * | | | | | Add new subgroup/project droplab button initialization on Group homepagekushalpandya2017-10-051-0/+6
| | | | | | |
| * | | | | | Remove new subgroup/project droplab button initializationkushalpandya2017-10-051-7/+0
| | | | | | |
| * | | | | | Hide "New subgroup" links when subgroups are not supportedBob Van Landuyt2017-10-052-10/+43
| | | | | | |
| * | | | | | Update feature specs for updated group listsBob Van Landuyt2017-10-054-41/+48
| | | | | | |
View Lorry Controller Status