summaryrefslogtreecommitdiff
path: root/spec/serializers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into 38464-k8s-appsShinya Maeda2017-11-081-1/+1
|\
| * Merge branch 'fix/gb/ensure-that-job-belongs-to-stage' into 'master'Kamil Trzciński2017-11-071-1/+1
| |\
| | * Fix pipeline entity test related to stagesfix/gb/ensure-that-job-belongs-to-stageGrzegorz Bizon2017-11-061-1/+1
* | | Fix spec. spec/serializers/cluster_application_entity_spec.rb and spec/serial...Shinya Maeda2017-11-082-3/+3
* | | Rename application_helm factory to cluster_application_helmAlessio Caiazza2017-11-071-2/+2
* | | Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce into...Shinya Maeda2017-11-073-3/+42
|\ \ \
| * \ \ Merge branch 'refactor-clusters' into 38464-k8s-appsAlessio Caiazza2017-11-062-3/+3
| |\ \ \ | | |/ /
| * | | Add ClusterApplicationEntity testsAlessio Caiazza2017-11-063-3/+42
* | | | Fix spec/serializers/cluster_entity_spec.rbShinya Maeda2017-11-071-2/+2
* | | | Merge branch 'master' into 38464-k8s-appsShinya Maeda2017-11-072-3/+3
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Remove 10.3 comments (Tracked by a tech debts issue). Refactor spec factory n...refactor-clustersShinya Maeda2017-11-062-3/+3
| * | Merge branch 'master' into refactor-clustersShinya Maeda2017-11-032-1/+30
| |\ \ | | |/
* | | Merge remote-tracking branch 'origin/master' into 38464-k8s-appsKamil Trzcinski2017-11-032-1/+30
|\ \ \ | | |/ | |/|
| * | CE port of code changed for epicsjk-epic-changes-ce-portJarka Kadlecova2017-11-022-1/+30
* | | Merge branch 'refactor-clusters' into 38464-k8s-appsKamil Trzcinski2017-11-028-28/+291
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' into refactor-clustersShinya Maeda2017-11-013-9/+40
| |\ \ | | |/
| | * Load participants asyncEric Eastwood2017-10-313-9/+40
| * | specs for serializers.Shinya Maeda2017-10-312-18/+39
| |/
| * 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-0/+9
| * | Use polymorphism for common attributes in `GroupChildEntity`Bob Van Landuyt2017-10-121-1/+10
| * | Fix spinach featuresBob Van Landuyt2017-10-111-1/+0
| * | Merge branch 'master' into bvl-group-treesBob Van Landuyt2017-10-105-6/+60
| |\ \ | | |/
| * | Optimize finding a membership for a user to avoid extra queriesBob Van Landuyt2017-10-051-2/+2
| * | Force parents to be preloaded for building a hierarchyBob Van Landuyt2017-10-051-4/+4
| * | Replace `full_path`, `path` & `web_url` with a single `relative_path`Bob Van Landuyt2017-10-041-4/+2
| * | Use same response-body in groups-dashboard as we do for group-homeBob Van Landuyt2017-10-041-0/+16
| * | Include `can_leave` for a groupBob Van Landuyt2017-10-041-0/+6
| * | Allow filtering children for a groupBob Van Landuyt2017-10-041-2/+45
| * | Merge group hierarchies when parents are sharedBob Van Landuyt2017-10-041-0/+43
| * | Render group children using the same entityBob Van Landuyt2017-10-041-1/+74
| * | Add serializer for group childrenBob Van Landuyt2017-10-041-0/+15
* | | WIP: mock cluster apps status APIAlessio Caiazza2017-10-312-1/+5
| |/ |/|
* | Stop using `branch_names.include?` and use `branch_exists?`Andrew Newdigate2017-10-101-1/+1
* | Add a project forks spec helperBob Van Landuyt2017-10-071-5/+5
* | Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-...Shinya Maeda2017-10-071-0/+13
|\ \
| * | Improve specs for pipeline failure reason presenterGrzegorz Bizon2017-10-051-0/+13
| |/
* | Merge branch 'master' into feature/sm/35954-create-kubernetes-cluster-on-gke-...Shinya Maeda2017-10-053-10/+84
|\ \ | |/
| * Merge branch '31050-registry-image-lists' into 'master'Grzegorz Bizon2017-10-042-0/+84
| |\
| | * Add serializer matchersKamil Trzcinski2017-10-022-0/+84
| * | Merge branch '36876-mr-show-json-controller-perf-improvements' into 'master'Douwe Maan2017-10-041-10/+0
| |\ \
| | * | Reduce method calls while evaluating Projects::MergeRequestsController#show.json36876-mr-show-json-controller-perf-improvementsOswaldo Ferreira2017-10-041-10/+0
| | |/
* | | Add serializers testsKamil Trzcinski2017-10-042-0/+41
|/ /
* | Resolve "Precompiled assets with digest strings are ignored in CI"Mike Greiling2017-10-033-4/+4
* | Add spec for Repository#ff_merge (ported from EE)Valery Sizov2017-09-191-1/+2
|/
* Detect n+1 issues involving GitalyAndrew Newdigate2017-09-191-2/+8
* Merge branch '29943-environment-folder' into 'security-9-5'Kamil Trzciński2017-09-071-0/+4
* Merge branch 'master' into zj-auto-devops-tableZeger-Jan van de Weg2017-09-041-0/+51
|\
| * Merge branch 'master' into issue-discussions-refactorFilipa Lacerda2017-08-121-6/+2
| |\
View Lorry Controller Status