summaryrefslogtreecommitdiff
path: root/app/serializers
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into 38464-k8s-appsKamil Trzcinski2017-11-034-8/+19
|\
| * CE port of code changed for epicsjk-epic-changes-ce-portJarka Kadlecova2017-11-024-8/+19
* | Improve backend structure of dataKamil Trzcinski2017-11-022-12/+6
* | Merge branch 'refactor-clusters' into 38464-k8s-appsKamil Trzcinski2017-11-0214-46/+206
|\ \ | |/
| * Load participants asyncEric Eastwood2017-10-315-7/+42
| * Added submodule support in multi-file editorPhil Hughes2017-10-201-1/+1
| * Fix inability to delete container registry tagsStan Hu2017-10-181-1/+1
| * Merge branch 'kt/bug/fix-revision-and-size-for-container-registry' into 'master'Grzegorz Bizon2017-10-181-1/+1
| |\
| | * Add short_revision and use total_sizeKamil Trzcinski2017-10-171-1/+1
| * | Make sure we always return an array of hierarchiesBob Van Landuyt2017-10-131-1/+3
| * | Use polymorphism for common attributes in `GroupChildEntity`Bob Van Landuyt2017-10-121-16/+12
| * | Merge branch 'master' into bvl-group-treesBob Van Landuyt2017-10-107-5/+24
| |\ \ | | |/
| * | Don't preload all memberships for a userBob Van Landuyt2017-10-101-1/+1
| * | Return `self` from `GroupChildSerializer#expand_hierarchy`Bob Van Landuyt2017-10-101-5/+5
| * | Use `expose` with blocks instead of defining methodsBob Van Landuyt2017-10-051-27/+26
| * | Rename parameters to paramsBob Van Landuyt2017-10-052-5/+5
| * | Optimize finding a membership for a user to avoid extra queriesBob Van Landuyt2017-10-051-5/+11
| * | Load counts everywhere we render a group treeBob Van Landuyt2017-10-051-32/+2
| * | Fix nesting bug when rendering children of a shared subgroupBob Van Landuyt2017-10-041-1/+1
| * | Minimize the number of queries by preloading counts and ancestorsBob Van Landuyt2017-10-041-4/+17
| * | Rename hierarchies to descendants where applicableBob Van Landuyt2017-10-041-1/+1
| * | Don't wrap arrays twice: `children` are already wrapped in an arrayBob Van Landuyt2017-10-041-2/+2
| * | Rename `GroupHierarchy` to `GroupDescendant`Bob Van Landuyt2017-10-042-4/+4
| * | `current_user:` as a keyword argumentBob Van Landuyt2017-10-041-1/+2
| * | Include pagination when rendering expanded hierarchiesBob Van Landuyt2017-10-042-17/+21
| * | Replace `full_path`, `path` & `web_url` with a single `relative_path`Bob Van Landuyt2017-10-041-1/+9
| * | Use same response-body in groups-dashboard as we do for group-homeBob Van Landuyt2017-10-041-2/+3
| * | Include `can_leave` for a groupBob Van Landuyt2017-10-041-1/+9
| * | Limit the amount of queries per rowBob Van Landuyt2017-10-041-5/+3
| * | Allow filtering children for a groupBob Van Landuyt2017-10-041-5/+9
| * | Merge group hierarchies when parents are sharedBob Van Landuyt2017-10-042-0/+40
| * | Render group children using the same entityBob Van Landuyt2017-10-041-6/+64
| * | Add serializer for group childrenBob Van Landuyt2017-10-042-0/+25
| * | Add a `WithPagination` concern to reuse across serializersBob Van Landuyt2017-10-044-34/+26
* | | WIP: mock cluster apps status APIAlessio Caiazza2017-10-312-1/+13
| |/ |/|
* | Merge branch '38245-private-avatars-are-not-cdn-compatible' into 'master'Douwe Maan2017-10-101-1/+1
|\ \
| * | Created group_icon and group_icon_urlTim Zallmann2017-10-041-1/+1
| |/
* | Merge branch 'feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-serv...Kamil Trzciński2017-10-062-0/+13
|\ \
| * \ Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-...Shinya Maeda2017-10-071-2/+6
| |\ \
| * \ \ Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-...Shinya Maeda2017-10-061-0/+1
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'origin/master' into feature/sm/35954-create-kub...Kamil Trzcinski2017-10-051-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-...Shinya Maeda2017-10-055-2/+68
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Remove status enum from Gcp::Cluster, use state_machine#stateKamil Trzcinski2017-10-041-1/+1
| * | | | | Introduce serializer for ClusterEntityKamil Trzcinski2017-10-032-0/+13
* | | | | | Merge branch '18608-lock-issues-v2' into 'master'Sean McGivern2017-10-061-1/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Disable comment form when discussion locked for userJarka Kadlecova2017-09-261-1/+1
| * | | | | Expose discussion_locked for issue_entityLuke "Jared" Bennett2017-09-141-0/+1
* | | | | | Merge branch 'backstage/gb/move-some-pipelines-code-from-ee-to-ee' into 'master'Grzegorz Bizon2017-10-061-2/+6
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Expose failure reason in pipeline error badgeGrzegorz Bizon2017-10-051-2/+6
| | |_|/ / | |/| | |
* | | | | Merge branch '38389-allow-merge-without-success' into 'master'Fatih Acet2017-10-051-0/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
View Lorry Controller Status