summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Replace google login image39201-improve-google-imageFilipa Lacerda2017-10-172-1/+1
* Merge branch 'bvl-do-not-use-redis-keys' into 'master'Rémy Coutable2017-10-176-36/+33
|\
| * Don't use `Redis#keys` in the circuitbreakerbvl-do-not-use-redis-keysBob Van Landuyt2017-10-176-36/+33
* | Merge branch 'bvl-fix-deleting-forked-projects' into 'master'Douwe Maan2017-10-174-2/+24
|\ \
| * | Fix errors when deleting a forked projectBob Van Landuyt2017-10-174-2/+24
* | | Merge branch '38156-breadcrumbs-margin' into 'master'Tim Zallmann2017-10-171-1/+1
|\ \ \
| * | | Use variable for mobile breadcrumbs padding38156-breadcrumbs-marginAnnabel Dunstone Gray2017-10-161-1/+1
* | | | Merge branch 'prevent-creating-multiple-application-settings' into 'master'Yorick Peterse2017-10-173-0/+17
|\ \ \ \
| * | | | Prevent creating multiple ApplicationSetting by forcing it to always have id=1prevent-creating-multiple-application-settingsKamil Trzcinski2017-10-163-0/+17
* | | | | Merge branch '39181-gitlab-backgroundmigration-deserializemergerequestdiffsan...Rémy Coutable2017-10-172-2/+20
|\ \ \ \ \
| * | | | | Handle null serialised commits in background migration39181-gitlab-backgroundmigration-deserializemergerequestdiffsandcommits-error-nomethoderror-undefined-method-map-for-nil-nilclassSean McGivern2017-10-172-2/+20
* | | | | | Merge branch 'fl-gke-collapsible-containers' into 'master'Phil Hughes2017-10-174-44/+67
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | 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
|\ \ \ \ \
| * | | | | 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
| | |/ / / | |/| | |
* | | | | Merge branch 'fix/github-doc' into 'master'Rémy Coutable2017-10-171-0/+1
|\ \ \ \ \
| * | | | | 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.6bump-git-2-13-6Balasankar C2017-10-171-1/+1
* | | | | Merge branch 'bvl-circuitbreaker-improvements' into 'master'Douwe Maan2017-10-1721-127/+212
|\ \ \ \ \
| * | | | | 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
| * | | | | 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
|\ \ \ \ \ \
| * | | | | | 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
| * | | | | | 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
| * | | | | | 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
View Lorry Controller Status