summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Replace google login image39201-improve-google-imageFilipa Lacerda2017-10-172-1/+1
* Merge branch 'bvl-fix-deleting-forked-projects' into 'master'Douwe Maan2017-10-172-2/+2
|\
| * Fix errors when deleting a forked projectBob Van Landuyt2017-10-172-2/+2
* | 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-171-0/+2
|\ \ \
| * | | Prevent creating multiple ApplicationSetting by forcing it to always have id=1prevent-creating-multiple-application-settingsKamil Trzcinski2017-10-161-0/+2
* | | | Adds collapsible sections in cluster pageFilipa Lacerda2017-10-174-44/+67
| |_|/ |/| |
* | | Merge branch 'bvl-circuitbreaker-improvements' into 'master'Douwe Maan2017-10-173-0/+65
|\ \ \
| * | | Allow configuring the circuitbreaker through the API and UIBob Van Landuyt2017-10-173-0/+65
* | | | Merge branch 'bvl-group-trees' into 'master'Douwe Maan2017-10-1755-729/+1696
|\ \ \ \
| * | | | 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-131-1/+3
| * | | | 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-133-5/+13
| * | | | Update preloaded count queries for MySQLBob Van Landuyt2017-10-121-3/+3
| * | | | Nest the group_children_path inside the canonical group pathBob Van Landuyt2017-10-122-32/+39
| * | | | Use Arel to build preloaded countsBob Van Landuyt2017-10-121-48/+45
| * | | | Pass `archived:` as a keyword argumentBob Van Landuyt2017-10-123-6/+6
| * | | | Use polymorphism for common attributes in `GroupChildEntity`Bob Van Landuyt2017-10-121-16/+12
| * | | | Fix spinach featuresBob Van Landuyt2017-10-112-2/+1
| * | | | Handle archived projects in the `GroupDescendantsFinder`Bob Van Landuyt2017-10-112-20/+49
| * | | | Add a text to the leave group confirmationBob Van Landuyt2017-10-101-0/+1
| * | | | Merge branch 'master' into bvl-group-treesBob Van Landuyt2017-10-10367-2247/+5042
| |\ \ \ \
| * | | | | 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-101-2/+2
| * | | | | 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-103-10/+25
| * | | | | Some cleanup in the GroupDescendantFinderBob Van Landuyt2017-10-101-8/+5
| * | | | | Don't load unneeded elements in GroupsController#showBob Van Landuyt2017-10-103-25/+8
| * | | | | 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-101-16/+14
| * | | | | Only expand ancestors when searchingBob Van Landuyt2017-10-091-7/+7
| * | | | | 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-051-10/+13
| * | | | | Use `expose` with blocks instead of defining methodsBob Van Landuyt2017-10-051-27/+26
| * | | | | Rename parameters to paramsBob Van Landuyt2017-10-052-5/+5
| * | | | | Use `alias_attribute` & `alias_method` to define parent-methodsBob Van Landuyt2017-10-051-8/+2
| * | | | | Optimize finding a membership for a user to avoid extra queriesBob Van Landuyt2017-10-052-5/+20
| * | | | | Load counts everywhere we render a group treeBob Van Landuyt2017-10-055-59/+71
| * | | | | Make sure all ancestors are loaded when searching groupsBob Van Landuyt2017-10-051-1/+1
| * | | | | Optimize queries and pagination in `GroupDescendantsFinder`Bob Van Landuyt2017-10-051-61/+32
| * | | | | Force parents to be preloaded for building a hierarchyBob Van Landuyt2017-10-051-5/+11
| * | | | | Move merging of Hashes out of the `GroupDescendant` concernBob Van Landuyt2017-10-041-53/+4
| * | | | | Groups tree enhancements for Groups Dashboard and Group HomepageKushal Pandya2017-10-0433-579/+1107
| * | | | | Return an empty array when no matches are foundBob Van Landuyt2017-10-041-1/+1