Fix merge + conflicts
Merge branch 'master' into update-hydra
No related branches found
No related tags found
Showing
- .gitlab-ci.yml 1 addition, 0 deletions.gitlab-ci.yml
- README.md 1 addition, 1 deletionREADME.md
- consent_provider/Dockerfile 1 addition, 1 deletionconsent_provider/Dockerfile
- docker-compose.yml 7 additions, 5 deletionsdocker-compose.yml
- helmchart/single-sign-on/templates/cronjob-create-oauth-clients.yaml 91 additions, 0 deletions...ingle-sign-on/templates/cronjob-create-oauth-clients.yaml
- helmchart/single-sign-on/templates/deployment-consent.yaml 1 addition, 1 deletionhelmchart/single-sign-on/templates/deployment-consent.yaml
- helmchart/single-sign-on/templates/deployment-userbackend.yaml 7 additions, 1 deletion...hart/single-sign-on/templates/deployment-userbackend.yaml
- helmchart/single-sign-on/values.yaml 18 additions, 10 deletionshelmchart/single-sign-on/values.yaml
- login_provider/Dockerfile 1 addition, 1 deletionlogin_provider/Dockerfile
- logout_provider/Dockerfile 1 addition, 1 deletionlogout_provider/Dockerfile
- test/create-hydra-client.bash 1 addition, 1 deletiontest/create-hydra-client.bash
- test/integration_tests/Dockerfile 1 addition, 1 deletiontest/integration_tests/Dockerfile
- test/integration_tests/README.md 16 additions, 27 deletionstest/integration_tests/README.md
- test/lint/pylint/Dockerfile 1 addition, 1 deletiontest/lint/pylint/Dockerfile
- user-panel 1 addition, 1 deletionuser-panel
Loading
Please register or sign in to comment