Merge remote-tracking branch 'upstream/master' into python-registry-v2
This commit is contained in:
commit
210ed7cf02
148 changed files with 1829 additions and 445 deletions
|
@ -544,6 +544,15 @@ class ImageStoragePlacement(BaseModel):
|
|||
)
|
||||
|
||||
|
||||
class UserRegion(BaseModel):
|
||||
user = QuayUserField(index=True, allows_robots=False)
|
||||
location = ForeignKeyField(ImageStorageLocation)
|
||||
|
||||
indexes = (
|
||||
(('user', 'location'), True),
|
||||
)
|
||||
|
||||
|
||||
class Image(BaseModel):
|
||||
# This class is intentionally denormalized. Even though images are supposed
|
||||
# to be globally unique we can't treat them as such for permissions and
|
||||
|
@ -733,6 +742,7 @@ class RepositoryNotification(BaseModel):
|
|||
repository = ForeignKeyField(Repository, index=True)
|
||||
event = ForeignKeyField(ExternalNotificationEvent)
|
||||
method = ForeignKeyField(ExternalNotificationMethod)
|
||||
title = CharField(null=True)
|
||||
config_json = TextField()
|
||||
|
||||
|
||||
|
@ -777,4 +787,4 @@ all_models = [User, Repository, Image, AccessToken, Role, RepositoryPermission,
|
|||
ExternalNotificationEvent, ExternalNotificationMethod, RepositoryNotification,
|
||||
RepositoryAuthorizedEmail, ImageStorageTransformation, DerivedImageStorage,
|
||||
TeamMemberInvite, ImageStorageSignature, ImageStorageSignatureKind,
|
||||
AccessTokenKind, Star, RepositoryActionCount, TagManifest, BlobUpload]
|
||||
AccessTokenKind, Star, RepositoryActionCount, TagManifest, BlobUpload, UserRegion]
|
||||
|
|
Reference in a new issue