Merge branch 'master' into git

data/database.py

@@ -299,7 +299,7 @@ class Repository(BaseModel):
     # Therefore, we define our own deletion order here and use the dependency system to verify it.
     ordered_dependencies = [RepositoryAuthorizedEmail, RepositoryTag, Image, LogEntry,
                             RepositoryBuild, RepositoryBuildTrigger, RepositoryNotification,
-                            RepositoryPermission, AccessToken, Star]
+                            RepositoryPermission, AccessToken, Star, RepositoryActionCount]
 
     for query, fk in self.dependencies(search_nullable=True):
       model = fk.model_class
@@ -498,6 +498,7 @@ class RepositoryTag(BaseModel):
   lifetime_start_ts = IntegerField(default=get_epoch_timestamp)
   lifetime_end_ts = IntegerField(null=True, index=True)
   hidden = BooleanField(default=False)
+  reversion = BooleanField(default=False)
 
   class Meta:
     database = db
@@ -561,6 +562,20 @@ class LogEntry(BaseModel):
   metadata_json = TextField(default='{}')
 
 
+class RepositoryActionCount(BaseModel):
+  repository = ForeignKeyField(Repository, index=True)
+  count = IntegerField()
+  date = DateField(index=True)
+
+  class Meta:
+    database = db
+    read_slaves = (read_slave,)
+    indexes = (
+      # create a unique index on repository and date
+      (('repository', 'date'), True),
+    )
+
+
 class OAuthApplication(BaseModel):
   client_id = CharField(index=True, default=random_string_generator(length=20))
   client_secret = CharField(default=random_string_generator(length=40))
@@ -646,4 +661,4 @@ all_models = [User, Repository, Image, AccessToken, Role, RepositoryPermission,
               ExternalNotificationEvent, ExternalNotificationMethod, RepositoryNotification,
               RepositoryAuthorizedEmail, ImageStorageTransformation, DerivedImageStorage,
               TeamMemberInvite, ImageStorageSignature, ImageStorageSignatureKind,
-              AccessTokenKind, Star]
+              AccessTokenKind, Star, RepositoryActionCount]