Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

C

core
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

ee7aee01

Commit ee7aee01 authored 7 years ago by Megan Henning Committed by GitHub 7 years ago

Downloads
- Plain Diff

Merge pull request #770 from scitran/uid-label-combo

Move uid upload logic to 'reaper' class, modify existing uid logic to always follow group/project

parents d769167a 7fae9fe5

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

api/api.py 4 additions, 4 deletions

api/api.py
api/dao/hierarchy.py 5 additions, 5 deletions

api/dao/hierarchy.py
api/placer.py 17 additions, 2 deletions

api/placer.py
api/upload.py 3 additions, 0 deletions

api/upload.py
test/integration_tests/python/conftest.py 16 additions, 10 deletions

test/integration_tests/python/conftest.py
test/integration_tests/python/test_uploads.py 188 additions, 4 deletions

test/integration_tests/python/test_uploads.py

with 233 additions and 25 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