Merge stable back into develop with resolved merge conflicts

[ogenstad]

Replaces #4463

As #4459 introduced a merge conflict between stable and develop the initial thought was to cherry-pick that commit and merge it back into stable. However resolving a merge conflict when cherry-picking doesn't quite seem to work as the operation rewrites the commit id.

When trying locally and merging stable into my branch i ended up with the same merge conflict again:

❯ git merge stable
Auto-merging backend/infrahub/core/schema_manager.py
Auto-merging backend/infrahub/graphql/types/mixin.py
CONFLICT (content): Merge conflict in backend/infrahub/graphql/types/mixin.py
Automatic merge failed; fix conflicts and then commit the result.

diff --cc backend/infrahub/graphql/types/mixin.py
index 1543fd455,6138a46b8..000000000
--- a/backend/infrahub/graphql/types/mixin.py
+++ b/backend/infrahub/graphql/types/mixin.py
@@@ -50,10 -51,6 +50,13 @@@ class GetListMixin
              edges = fields.get("edges", {})
              node_fields = edges.get("node", {})

++<<<<<<< HEAD
 +            permissions = fields.get("permissions")
 +            if permissions:
 +                response["permissions"] = await get_permissions(db=db, schema=cls._meta.schema, context=context)
 +
++=======
++>>>>>>> stable
              objs = []
              if edges or "hfid" in filters:
                  objs = await NodeManager.query(
@@@ -63,12 -60,12 +66,21 @@@
                      fields=node_fields,
                      at=context.at,
                      branch=context.branch,
++<<<<<<< HEAD
 +                    limit=query_args.limit,
 +                    offset=query_args.offset,
 +                    account=context.account_session,
 +                    include_source=True,
 +                    include_owner=True,
 +                    partial_match=query_args.partial_match,
++=======
+                     limit=limit,
+                     offset=offset,
+                     account=context.account_session,
+                     include_source=True,
+                     include_owner=True,
+                     partial_match=partial_match,
++>>>>>>> stable
                  )

As a result of that I've instead taken all of the changes from stable and resolved the merge conflict like we normally do with an intermediate branch that includes the original commit.

[ajtmccarty]

can be closed. is superseded by #4480