Commits · 30d7ea1417ca38fa89cedf6303daf79186b9d400 · nexedi / gitlab-ce

08 Jan, 2018 36 commits
- Mock data for Geo Nodes app tests · 30d7ea14
  Kushal Pandya authored Jan 08, 2018
  
  30d7ea14
- GeoNodeEventStatus Component tests · 53b06311
  Kushal Pandya authored Jan 08, 2018
  
  53b06311
- GeoNodeEventStatus Component · 7e2c1283
  Kushal Pandya authored Jan 08, 2018
  
  7e2c1283
- GeoNodeSyncSettings Component tests · dccde647
  Kushal Pandya authored Jan 08, 2018
  
  dccde647
- GeoNodeSyncSettings Component · 49ae6cd8
  Kushal Pandya authored Jan 08, 2018
  
  49ae6cd8
- GeoNodeHealthStatus Component tests · c3414e8f
  Kushal Pandya authored Jan 08, 2018
  
  c3414e8f
- GeoNodeHealthStatus Component · e1b217fb
  Kushal Pandya authored Jan 08, 2018
  
  e1b217fb
- GeoNodeDetailItem Component tests · e7d17a3d
  Kushal Pandya authored Jan 08, 2018
  
  e7d17a3d
- GeoNodeDetailItem Component · 0257b272
  Kushal Pandya authored Jan 08, 2018
  
  0257b272
- GeoNodeDetails Component tests · c09e5643
  Kushal Pandya authored Jan 08, 2018
  
  c09e5643
- GeoNodeDetails Component · d8361303
  Kushal Pandya authored Jan 08, 2018
  
  d8361303
- GeoNodeActions Component tests · 80ab0c8c
  Kushal Pandya authored Jan 08, 2018
  
  80ab0c8c
- GeoNodeActions Component · ee172a90
  Kushal Pandya authored Jan 08, 2018
  
  ee172a90
- GeoNodeItem Component tests · 6128b119
  Kushal Pandya authored Jan 08, 2018
  
  6128b119
- GeoNodeItem Component · a0d226f8
  Kushal Pandya authored Jan 08, 2018
  
  a0d226f8
- GeoNodesList Component tests · b7824554
  Kushal Pandya authored Jan 08, 2018
  
  b7824554
- GeoNodesList Component · daadea0d
  Kushal Pandya authored Jan 08, 2018
  
  daadea0d
- GeoNodesApp Component tests · 8a2b7413
  Kushal Pandya authored Jan 08, 2018
  
  8a2b7413
- GeoNodesApp Component · 024c9c75
  Kushal Pandya authored Jan 08, 2018
  
  024c9c75
- StackedProgressBar Component tests · 6203a6e5
  Kushal Pandya authored Jan 08, 2018
  
  6203a6e5
- StackedProgressBar Component · bde8b565
  Kushal Pandya authored Jan 08, 2018
  
  bde8b565
- Geo Nodes Service tests · 5ec04aa0
  Kushal Pandya authored Jan 08, 2018
  
  5ec04aa0
- Geo Nodes Service · 6df41d3a
  Kushal Pandya authored Jan 08, 2018
  
  6df41d3a
- Geo Nodes Store tests · 59153b50
  Kushal Pandya authored Jan 08, 2018
  
  59153b50
- Geo Nodes Store · 50347ca3
  Kushal Pandya authored Jan 08, 2018
  
  50347ca3
- Geo Nodes app global constants · d87d4b69
  Kushal Pandya authored Jan 08, 2018
  
  d87d4b69
- Geo Nodes shared event hub · 1df814a9
  Kushal Pandya authored Jan 08, 2018
  
  1df814a9
- Geo Nodes app root · 260db90f
  Kushal Pandya authored Jan 08, 2018
  
  260db90f
- Add `geo_nodes` app entry · 5c8339e3
  Kushal Pandya authored Jan 08, 2018
  
  5c8339e3
- Replace template with Vue app root, add empty state · 7be72137
  Kushal Pandya authored Jan 08, 2018
  
  7be72137
- Geo admin page empty state partial · be9e9211
  Kushal Pandya authored Jan 08, 2018
  
  be9e9211
- Remove tests for URL check flash error · b2fa2039
  Kushal Pandya authored Jan 08, 2018
  
  b2fa2039
- Remove URL check flash error as it is now handled on client side · ea44fb6a
  Kushal Pandya authored Jan 08, 2018
  
  ea44fb6a
- Update styles to be Vue component compatible · 08a40fd8
  Kushal Pandya authored Jan 08, 2018
  
  08a40fd8
- Empty state illustration for Geo nodes admin page · 922d9c55
  Kushal Pandya authored Jan 08, 2018
  
  922d9c55
- Merge branch 'ce-to-ee-2018-01-07' into 'master' · 7794c857
  James Lopez authored Jan 08, 2018
```
CE upstream - Sunday

See merge request gitlab-org/gitlab-ee!3953
```
  7794c857
07 Jan, 2018 4 commits
- Resolve check_gcp_project_billing_worker_spec.rb · dc073212
  LUKE BENNETT authored Jan 07, 2018
  
  dc073212
- Resolve gcp_spec.rb · 50c19abd
  LUKE BENNETT authored Jan 07, 2018
  
  50c19abd
- Resolve check_gcp_project_billing_worker.rb · fdccd971
  LUKE BENNETT authored Jan 07, 2018
  
  fdccd971
- Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-01-07 · 40dfdd30
  GitLab Bot authored Jan 07, 2018
```
# Conflicts:
#	app/workers/check_gcp_project_billing_worker.rb
#	spec/features/projects/clusters/gcp_spec.rb
#	spec/workers/check_gcp_project_billing_worker_spec.rb

[ci skip]
```
  40dfdd30