Merge remote-tracking branch 'upstream/master' into torrent

CHANGELOG.md

@@ -1,3 +1,17 @@
+### v1.14.1
+
+- Fixed migration of V1 metadata (#1120)
+- Added list view of repositories in all displays (#1109)
+- Removed image diff feature (#1102, #1116)
+- Fixed log bug around month handling (#1114)
+- Added better recovery of organizations (#1108)
+- Fixed Content-Type on errors with JSON bodies (#1107)
+- Added QE version in footer
+- Fixed unhandled exceptions in Queue
+- Improved database query performance (#1068, #1097)
+- Fixed UI for dismissing notifications (#1094)
+- Added namespaces in `docker search` results (#1086)
+
 ### v1.14.0
 
 - Added Docker Registry v2 support (#885)

endpoints/api/repository.py

@@ -331,8 +331,9 @@ class Repository(RepositoryParamResource):
     """ Delete a repository. """
     model.repository.purge_repository(namespace, repository)
     user = model.user.get_namespace_user(namespace)
-    plan = get_namespace_plan(namespace)
+    if features.BILLING:
-    check_repository_usage(user, plan)
+      plan = get_namespace_plan(namespace)
+      check_repository_usage(user, plan)
     log_action('delete_repo', namespace,
                {'repo': repository, 'namespace': namespace})
     return 'Deleted', 204

endpoints/api/team.py

@@ -350,7 +350,7 @@ class InviteTeamMember(ApiResource):
 @internal_only
 @show_if(features.MAILING)
 class TeamMemberInvite(ApiResource):
-  """ Resource for managing invites to jon a team. """
+  """ Resource for managing invites to join a team. """
   @require_user_admin
   @nickname('acceptOrganizationTeamInvite')
   def put(self, code):