summaryrefslogtreecommitdiff
path: root/spec/serializers
Commit message (Expand)AuthorAgeFilesLines
* Refactor discussions/notes codeJan Provaznik2018-04-033-50/+31
* Merge branch 'add-canary-favicon' into 'master'Sean McGivern2018-03-291-0/+5
|\
| * Be explicit about when yellow favicon is usedEric Eastwood2018-03-281-1/+1
| * Update styling and use Gitlab::Utils.to_booleanEric Eastwood2018-03-271-0/+5
* | Fix pipeline serializer specSean McGivern2018-03-151-1/+1
* | Merge remote-tracking branch 'origin/master' into 40781-os-to-ceMicaël Bergeron2018-03-085-4/+87
|\ \ | |/
| * Don't do a commit lookup to present the MR entity, just return the shamr-commit-optimizationAlejandro Rodríguez2018-03-061-4/+2
| * Merge branch '42643-persist-external-ip-of-ingress-controller-gke' into 'master'Kamil Trzciński2018-03-011-0/+14
| |\
| | * Fix rubocop warning (#42643)Dylan Griffith2018-02-161-1/+1
| | * Persist external IP of ingress controller created for GKE (#42643)Dylan Griffith2018-02-151-0/+14
| * | Render MR Notes with Vue with behind a cookieFatih Acet2018-02-283-0/+71
| |/
* | fix specsMicaël Bergeron2018-03-071-1/+0
* | fix some broken specsMicaël Bergeron2018-03-061-0/+1
* | Merge commit '7e424eb852716495073881710e8a8851b4a4cd5a' into object-storage-e...Kamil Trzciński2018-02-283-0/+47
|\ \ | |/
| * Backport of LFS File Locking APIrd-35856-backport-lfs-file-locking-apiRubén Dávila2018-02-071-0/+19
| * Add GroupVariableSerializer for Ci::GroupVariableMatija Čupić2018-02-051-0/+14
| * Add VariableSerializer for Ci::VariableMatija Čupić2018-02-051-0/+14
* | Merge commit '8af23def1d6' into object-storage-ee-to-ce-backportKamil Trzciński2018-02-281-6/+9
|\ \ | |/
| * Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-3' into 'securit...Douwe Maan2018-01-161-6/+9
* | Merge commit '4b92efd90cedaa0aff218d11fdce279701128bea' into object-storage-e...Kamil Trzciński2018-02-286-74/+129
|\ \ | |/
| * Merge branch '40549-render-emoj-in-groups-overview' into 'master'Sean McGivern2018-01-081-1/+11
| |\
| | * Rendering of emoji's in Group-OverviewJacopo2017-12-241-1/+11
| * | Backport 'Rebase' feature from EE to CEjprovazn-rebaseJan Provaznik2018-01-051-0/+16
| * | Fixes spec failures due to not returning metrics for MRs other than closed/me...Oswaldo Ferreira2018-01-021-0/+1
| * | Cache merged and closed events data in merge_request_metrics tableOswaldo Ferreira2018-01-022-13/+74
| * | Extend Cluster Applications to allow installation of PrometheusMayra Cabrera2017-12-221-2/+2
| |/
| * Fall back to the `MergeRequestWidgetEntity`Bob Van Landuyt2017-12-211-2/+2
| * Load commit in batches for pipelines#indexZeger-Jan van de Weg2017-12-191-3/+3
| * Stop sending milestone and labels data over the wire for MR widgetosw-isolate-mr-widget-exposed-attributesOswaldo Ferreira2017-12-152-61/+28
* | Merge branch 'zj-multiple-artifacts-ee' into 'master'Grzegorz Bizon2018-02-281-1/+2
|/
* Use actual head pipeline on merge request serializerFelipe Artur2017-12-051-9/+21
* Fix most test failuresZeger-Jan van de Weg2017-12-031-1/+1
* Rename Artifact to JobArtifact, split metadata outZeger-Jan van de Weg2017-12-031-1/+1
* 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