From: Michal Klobukowski <michal.klobukowski@contractors.roche.com>
Date: Thu, 29 Nov 2018 09:42:35 +0000 (+0100)
Subject: Merge branch 'master' into 14393-vocabulary
X-Git-Tag: 1.3.0~5^2^2^2
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/b7de31f185fccd2f9b276c1e89754d288e7facfe

Merge branch 'master' into 14393-vocabulary

refs #14393

Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski@contractors.roche.com>
---

b7de31f185fccd2f9b276c1e89754d288e7facfe
diff --cc src/services/services.ts
index b0d3ba67,f1ef86b8..b24b1d99
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@@ -24,9 -24,9 +24,10 @@@ import { ApiActions } from "~/services/
  import { WorkflowService } from "~/services/workflow-service/workflow-service";
  import { SearchService } from '~/services/search-service/search-service';
  import { PermissionService } from "~/services/permission-service/permission-service";
+ import { VirtualMachinesService } from "~/services/virtual-machines-service/virtual-machines-service";
  import { RepositoriesService } from '~/services/repositories-service/repositories-service';
  import { AuthorizedKeysService } from '~/services/authorized-keys-service/authorized-keys-service';
 +import { VocabularyService } from '~/services/vocabulary-service/vocabulary-service';
  
  export type ServiceRepository = ReturnType<typeof createServices>;
  
@@@ -79,9 -79,9 +81,10 @@@ export const createServices = (config: 
          searchService,
          tagService,
          userService,
+         virtualMachineService,
          webdavClient,
          workflowService,
 +        vocabularyService,
      };
  };