Merge branch 'GREG-36-feide' into 'master' (d7485898) · Commits · it-bott-integrasjoner / greg · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

G

greg
- Activity
- Members
- Labels
- Environments
- Terraform modules

Snippets Groups Projects

This is an archived project. Repository and other project resources are read-only.

d7485898

Commit d7485898 authored 3 years ago by Sivert Kronen Hatteberg

Downloads
- Plain Diff

Merge branch 'GREG-36-feide' into 'master'

Greg 36 feide

See merge request !75

parents 4a69a757 1dc75ca7

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 16
Pipelines 1

Expand all Hide whitespace changes

Inline Side-by-side

Showing

Makefile 1 addition, 1 deletion

Makefile
gregsite/settings/base.py 32 additions, 2 deletions

gregsite/settings/base.py
gregsite/settings/dev.py 15 additions, 0 deletions

gregsite/settings/dev.py
gregsite/urls.py 2 additions, 1 deletion

gregsite/urls.py
gregui/admin.py 9 additions, 1 deletion

gregui/admin.py
gregui/api/views/guest.py 2 additions, 1 deletion

gregui/api/views/guest.py
gregui/api/views/userinfo.py 46 additions, 0 deletions

gregui/api/views/userinfo.py
gregui/authentication/__init__.py 0 additions, 0 deletions

gregui/authentication/__init__.py
gregui/authentication/auth_backends.py 286 additions, 0 deletions

gregui/authentication/auth_backends.py
gregui/migrations/0001_initial.py 70 additions, 0 deletions

gregui/migrations/0001_initial.py
gregui/models.py 24 additions, 1 deletion

gregui/models.py
gregui/tests/conftest.py 15 additions, 13 deletions

gregui/tests/conftest.py
gregui/urls.py 2 additions, 0 deletions

gregui/urls.py
gregui/views.py 2 additions, 0 deletions

gregui/views.py
poetry.lock 188 additions, 1 deletion

poetry.lock
pyproject.toml 1 addition, 0 deletions

pyproject.toml

with 695 additions and 21 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