Commits
![Marc-Danie Nazaire](https://secure.gravatar.com/avatar/5791d61dc20b16df2872683b83344a1e.jpg?s=96&d=mm)
Marc-Danie Nazaire authored 857e5961b2bM
Merge pull request #1026 in SHRINE/shrine from feature/SHRINE2020-456 to develop * commit 'faafbf0fcff83463a75500c3329ffd3aea4fa141': (62 commits) SHRINE2020-456 - Simplify shrine.conf with default values - modified to use buildURI in EndpointConfig SHRINE2020-456 - Simplify shrine.conf with default values - replace .map.getOrElse with orElse SHRINE2020-456 - Simplify shrine.conf with default values - modified to use buildURI in ConfigExtensions SHRINE2020-456 - Simplify shrine.conf with default values - removed trailing slash SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - modified i2b2BaseUrl to look like a fake URL SHRINE2020-456 - Simplify shrine.conf with default values - removed trailing slash SHRINE2020-456 - Simplify shrine.conf with default values - Modified to use .map.getOrElse SHRINE2020-456 - Simplify shrine.conf with default values - Fixed StaticDataServiceTest SHRINE2020-456 - Simplify shrine.conf with default values - Added default value for webclient.nextStepsUrl SHRINE2020-456 - Simplify shrine.conf with default values - Added default value for networkStatusQuery SHRINE2020-456 - Simplify shrine.conf with default values - Fix retrieval of hub.client.serverUrl SHRINE2020-456 - Simplify shrine.conf with default values - Removed debug statement SHRINE2020-456 - Simplify shrine.conf with default values - Set createTopicsMode = Pending in shrine.conf for unit tests and updated I2B2ServiceTest to use @Test SHRINE2020-456 - Simplify shrine.conf with default values - Set default for createTopicsMode to Approved in the shrine auth, updated the shrine.conf in shrine-setup to reflect new defaults and keys account for directory restructuring in dockerignore SHRINE2020-468 - Passwords in shrine.conf make support difficult - Modified the shrine.conf's units tests to use the default values SHRINE2020-468 - Passwords in shrine.conf make support difficult - Added password.conf to docker, unit tests, and removed getOptionWithFallback SHRINE2020-468 - Passwords in shrine.conf make support difficult - Added more test password.conf file SHRINE2020-468 - Passwords in shrine.conf make support difficult - Added test password.conf file SHRINE2020-468 - Passwords in shrine.conf make support difficult - changed shrine.keystore.password to be the correct password for the test shrine.keystore file ...
Showing diff tofaafbf0fcff