Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

Rosetta
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

1e588e61

Commit 1e588e61 authored 4 years ago by Stefano Alberto Russo

Downloads
- Plain Diff

Merge branch 'feature/OpenID' into develop

parents 6e7a544d 39aa1ddd

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

services/proxy/default-ssl.conf 3 additions, 1 deletion

services/proxy/default-ssl.conf
services/webapp/code/rosetta/auth.py 26 additions, 0 deletions

services/webapp/code/rosetta/auth.py
services/webapp/code/rosetta/context_processors.py 9 additions, 0 deletions

services/webapp/code/rosetta/context_processors.py
services/webapp/code/rosetta/core_app/templates/account.html 15 additions, 2 deletions

services/webapp/code/rosetta/core_app/templates/account.html
services/webapp/code/rosetta/core_app/templates/navigation.html 18 additions, 0 deletions

...es/webapp/code/rosetta/core_app/templates/navigation.html
services/webapp/code/rosetta/core_app/utils.py 28 additions, 0 deletions

services/webapp/code/rosetta/core_app/utils.py
services/webapp/code/rosetta/core_app/views.py 2 additions, 24 deletions

services/webapp/code/rosetta/core_app/views.py
services/webapp/code/rosetta/settings.py 47 additions, 0 deletions

services/webapp/code/rosetta/settings.py
services/webapp/code/rosetta/urls.py 4 additions, 1 deletion

services/webapp/code/rosetta/urls.py
services/webapp/requirements.txt 1 addition, 0 deletions

services/webapp/requirements.txt

with 153 additions and 28 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment