Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Use actual head pipeline on merge request serializer | Felipe Artur | 2017-12-05 | 1 | -1/+1 |
| | |||||
* | Merge branch 'fix/sm/31771-do-not-allow-jobs-to-be-erased-new' into 'master' | Kamil Trzciński | 2017-11-14 | 1 | -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 erased | Shinya Maeda | 2017-11-06 | 1 | -1/+1 |
| | | |||||
* | | Clean up schema of the "issues" tablecleanup-issues-schema | Yorick Peterse | 2017-11-09 | 1 | -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-apps | Shinya Maeda | 2017-11-08 | 3 | -8/+4 |
|\ \ | |||||
| * | | Multi-file editor fetch log data from a different endpoint | Phil Hughes | 2017-11-06 | 3 | -8/+4 |
| |/ | | | | | | | Closes #38360 | ||||
* | | Add ClusterApplicationEntity tests | Alessio Caiazza | 2017-11-06 | 2 | -2/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into 38464-k8s-apps | Kamil Trzcinski | 2017-11-03 | 4 | -8/+19 |
|\ \ | |/ | |||||
| * | CE port of code changed for epicsjk-epic-changes-ce-port | Jarka Kadlecova | 2017-11-02 | 4 | -8/+19 |
| | | |||||
* | | Improve backend structure of data | Kamil Trzcinski | 2017-11-02 | 2 | -12/+6 |
| | | |||||
* | | Merge branch 'refactor-clusters' into 38464-k8s-apps | Kamil Trzcinski | 2017-11-02 | 14 | -46/+206 |
|\ \ | |/ | |||||
| * | Load participants async | Eric Eastwood | 2017-10-31 | 5 | -7/+42 |
| | | |||||
| * | Added submodule support in multi-file editor | Phil Hughes | 2017-10-20 | 1 | -1/+1 |
| | | |||||
| * | Fix inability to delete container registry tags | Stan Hu | 2017-10-18 | 1 | -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 Bizon | 2017-10-18 | 1 | -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_size | Kamil Trzcinski | 2017-10-17 | 1 | -1/+1 |
| | | | |||||
| * | | Make sure we always return an array of hierarchies | Bob Van Landuyt | 2017-10-13 | 1 | -1/+3 |
| | | | | | | | | | | | | Even when we pass an array of only a single object | ||||
| * | | Use polymorphism for common attributes in `GroupChildEntity` | Bob Van Landuyt | 2017-10-12 | 1 | -16/+12 |
| | | | |||||
| * | | Merge branch 'master' into bvl-group-trees | Bob Van Landuyt | 2017-10-10 | 7 | -5/+24 |
| |\ \ | | |/ | |||||
| * | | Don't preload all memberships for a user | Bob Van Landuyt | 2017-10-10 | 1 | -1/+1 |
| | | | |||||
| * | | Return `self` from `GroupChildSerializer#expand_hierarchy` | Bob Van Landuyt | 2017-10-10 | 1 | -5/+5 |
| | | | |||||
| * | | Use `expose` with blocks instead of defining methods | Bob Van Landuyt | 2017-10-05 | 1 | -27/+26 |
| | | | |||||
| * | | Rename parameters to params | Bob Van Landuyt | 2017-10-05 | 2 | -5/+5 |
| | | | |||||
| * | | Optimize finding a membership for a user to avoid extra queries | Bob Van Landuyt | 2017-10-05 | 1 | -5/+11 |
| | | | |||||
| * | | Load counts everywhere we render a group tree | Bob Van Landuyt | 2017-10-05 | 1 | -32/+2 |
| | | | |||||
| * | | Fix nesting bug when rendering children of a shared subgroup | Bob Van Landuyt | 2017-10-04 | 1 | -1/+1 |
| | | | |||||
| * | | Minimize the number of queries by preloading counts and ancestors | Bob Van Landuyt | 2017-10-04 | 1 | -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 applicable | Bob Van Landuyt | 2017-10-04 | 1 | -1/+1 |
| | | | |||||
| * | | Don't wrap arrays twice: `children` are already wrapped in an array | Bob Van Landuyt | 2017-10-04 | 1 | -2/+2 |
| | | | | | | | | | | | | We do the wrapping in an array in represent_hierarchy for children. | ||||
| * | | Rename `GroupHierarchy` to `GroupDescendant` | Bob Van Landuyt | 2017-10-04 | 2 | -4/+4 |
| | | | |||||
| * | | `current_user:` as a keyword argument | Bob Van Landuyt | 2017-10-04 | 1 | -1/+2 |
| | | | |||||
| * | | Include pagination when rendering expanded hierarchies | Bob Van Landuyt | 2017-10-04 | 2 | -17/+21 |
| | | | |||||
| * | | Replace `full_path`, `path` & `web_url` with a single `relative_path` | Bob Van Landuyt | 2017-10-04 | 1 | -1/+9 |
| | | | |||||
| * | | Use same response-body in groups-dashboard as we do for group-home | Bob Van Landuyt | 2017-10-04 | 1 | -2/+3 |
| | | | |||||
| * | | Include `can_leave` for a group | Bob Van Landuyt | 2017-10-04 | 1 | -1/+9 |
| | | | |||||
| * | | Limit the amount of queries per row | Bob Van Landuyt | 2017-10-04 | 1 | -5/+3 |
| | | | |||||
| * | | Allow filtering children for a group | Bob Van Landuyt | 2017-10-04 | 1 | -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 shared | Bob Van Landuyt | 2017-10-04 | 2 | -0/+40 |
| | | | |||||
| * | | Render group children using the same entity | Bob Van Landuyt | 2017-10-04 | 1 | -6/+64 |
| | | | |||||
| * | | Add serializer for group children | Bob Van Landuyt | 2017-10-04 | 2 | -0/+25 |
| | | | |||||
| * | | Add a `WithPagination` concern to reuse across serializers | Bob Van Landuyt | 2017-10-04 | 4 | -34/+26 |
| | | | |||||
* | | | WIP: mock cluster apps status API | Alessio Caiazza | 2017-10-31 | 2 | -1/+13 |
| |/ |/| | |||||
* | | Merge branch '38245-private-avatars-are-not-cdn-compatible' into 'master' | Douwe Maan | 2017-10-10 | 1 | -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_url | Tim Zallmann | 2017-10-04 | 1 | -1/+1 |
| |/ | | | | | | | Tests for these new helper methods | ||||
* | | Merge branch ↵ | Kamil Trzciński | 2017-10-06 | 2 | -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 Maeda | 2017-10-07 | 1 | -2/+6 |
| |\ \ | | | | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service | ||||
| * \ \ | Merge branch 'master' into ↵ | Shinya Maeda | 2017-10-06 | 1 | -0/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service | ||||
| * \ \ \ | Merge remote-tracking branch 'origin/master' into ↵ | Kamil Trzcinski | 2017-10-05 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service | ||||
| * \ \ \ \ | Merge branch 'master' into ↵ | Shinya Maeda | 2017-10-05 | 5 | -2/+68 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | feature/sm/35954-create-kubernetes-cluster-on-gke-from-k8s-service | ||||
| * | | | | | Remove status enum from Gcp::Cluster, use state_machine#state | Kamil Trzcinski | 2017-10-04 | 1 | -1/+1 |
| | | | | | |