This is an automated email from the ASF dual-hosted git repository. ankovalyshyn pushed a commit to branch DLAB-1235 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 9a35920241abc14f21b3782ce053f0d9acad308d Merge: 5caa44f 5cac7af Author: Andriana Kovalyshyn <andriana_kovalys...@epam.com> AuthorDate: Wed Nov 20 10:24:39 2019 +0200 Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1235 .../src/general/lib/aws/actions_lib.py | 6 +- .../src/general/scripts/azure/project_prepare.py | 2 +- .../src/ssn/files/aws/mongo_roles.json | 20 ++-- .../src/ssn/files/gcp/mongo_roles.json | 4 +- .../backendapi/resources/EnvironmentResource.java | 12 +-- .../backendapi/service/EnvironmentService.java | 15 ++- .../service/impl/EnvironmentServiceImpl.java | 52 +++------ .../service/impl/ProjectServiceImpl.java | 10 +- .../src/main/resources/mongo/aws/mongo_roles.json | 10 ++ .../src/main/resources/mongo/gcp/mongo_roles.json | 10 ++ .../management/endpoints/endpoints.component.html | 2 +- .../management/endpoints/endpoints.component.scss | 3 + .../reporting-grid/reporting-grid.component.scss | 2 + .../computational-resources-list.component.html | 8 +- .../computational-resources-list.component.ts | 11 +- .../detail-dialog/detail-dialog.component.html | 10 +- .../resources-grid/resources-grid.component.html | 10 +- .../resources-grid/resources-grid.component.scss | 14 +++ .../resources/webapp/src/assets/styles/_theme.scss | 1 + .../src/main/resources/webapp/src/styles.scss | 9 ++ .../resources/EnvironmentResourceTest.java | 61 +++++------ .../backendapi/resources/ProjectResourceTest.java | 2 +- .../service/impl/EnvironmentServiceImplTest.java | 116 +++------------------ 23 files changed, 177 insertions(+), 213 deletions(-) --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org