Merge branch 'feature/orgreg-ous' into 'master' (f44debb2) · 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.

f44debb2

Commit f44debb2 authored 3 years ago by Andreas Ellewsen

Downloads
- Plain Diff

Merge branch 'feature/orgreg-ous' into 'master'

Feature/orgreg ous

See merge request !49

parents a5c8a9a1 d3fe764d

No related branches found

No related tags found

1 merge request!49Feature/orgreg ous

Pipeline #93101 passed 3 years ago

Stage: test

Changes 9
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

greg/admin.py 3 additions, 2 deletions

greg/admin.py
greg/management/commands/import_from_orgreg.py 121 additions, 0 deletions

greg/management/commands/import_from_orgreg.py
greg/migrations/0004_ou_deleted_active.py 23 additions, 0 deletions

greg/migrations/0004_ou_deleted_active.py
greg/models.py 2 additions, 0 deletions

greg/models.py
greg/tests/management/test_import_from_orgreg.py 73 additions, 0 deletions

greg/tests/management/test_import_from_orgreg.py
gregsite/settings/dev.py 5 additions, 0 deletions

gregsite/settings/dev.py
mypy.ini 3 additions, 0 deletions

mypy.ini
poetry.lock 95 additions, 5 deletions

poetry.lock
pyproject.toml 2 additions, 0 deletions

pyproject.toml

with 327 additions and 7 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