summaryrefslogtreecommitdiff
path: root/app/serializers
Commit message (Collapse)AuthorAgeFilesLines
* Use actual head pipeline on merge request serializerFelipe Artur2017-12-051-1/+1
|
* Merge branch 'fix/sm/31771-do-not-allow-jobs-to-be-erased-new' into 'master'Kamil Trzciński2017-11-141-1/+1
|\ | | | | | | | | | | | | Do not allow jobs to be erased Closes #31771 See merge request gitlab-org/gitlab-ce!15216
| * Do not allow jobs to be erasedShinya Maeda2017-11-061-1/+1
| |
* | Clean up schema of the "issues" tablecleanup-issues-schemaYorick Peterse2017-11-091-1/+0
| | | | | | | | | | | | | | | | This adds various foreign key constraints, indexes, missing NOT NULL constraints, and changes some column types from timestamp to timestamptz. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/31811
* | Merge branch 'master' into 38464-k8s-appsShinya Maeda2017-11-083-8/+4
|\ \
| * | Multi-file editor fetch log data from a different endpointPhil Hughes2017-11-063-8/+4
| |/ | | | | | | Closes #38360
* | Add ClusterApplicationEntity testsAlessio Caiazza2017-11-062-2/+2
| |
* | 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
| | | | | | | | | | | | | | | | Because container registry tags can have periods, the addition of the `.json` format caused ambiguity. Since the tag name regex is greedy, it would attempt to locate an image named `foo.json` instead of `foo`. Closes #39260
| * 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_size Closes #39203 See merge request gitlab-org/gitlab-ce!14917
| | * 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
| | | | | | | | | | | | Even when we pass an array of only a single object
| * | 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
| | | | | | | | | | | | | | | | | | | | | | | | By preloading the count of members, projects and subgroups of a group, we don't need to query them later. We also preload the entire hierarchy for a search result and include the counts so we don't need to query for them again
| * | 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
| | | | | | | | | | | | We do the wrapping in an array in represent_hierarchy for children.
| * | 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
| | | | | | | | | | | | | | | When fetching children for a group with a filter, we will search all nested groups for results and render them in an expanded tree
| * | 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
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Private Avatars are not CDN compatible" Closes #38245 and gitlab-com/support-forum#2476 See merge request gitlab-org/gitlab-ce!14443
| * | Created group_icon and group_icon_urlTim Zallmann2017-10-041-1/+1
| |/ | | | | | | Tests for these new helper methods
* | Merge branch ↵Kamil Trzciński2017-10-062-0/+13
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 'feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service' into 'master' Create Kubernetes cluster on GKE from k8s service Closes #35954 See merge request gitlab-org/gitlab-ce!14470
| * \ Merge branch 'master' into ↵Shinya Maeda2017-10-071-2/+6
| |\ \ | | | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
| * \ \ Merge branch 'master' into ↵Shinya Maeda2017-10-061-0/+1
| |\ \ \ | | | | | | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
| * \ \ \ Merge remote-tracking branch 'origin/master' into ↵Kamil Trzcinski2017-10-051-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
| * \ \ \ \ Merge branch 'master' into ↵Shinya Maeda2017-10-055-2/+68
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service
| * | | | | Remove status enum from Gcp::Cluster, use state_machine#stateKamil Trzcinski2017-10-041-1/+1
| | | | | |