Merge conflicts fixed

src/Bundle/ChillMainBundle/chill.api.specs.yaml

@@ -116,7 +116,15 @@ components:
                                 type: number
                             minItems: 2
                             maxItems: 2
-
+        UserJob:
+            type: object
+            properties:
+                id:
+                    type: integer
+                label:
+                    type: object
+                type:
+                    type: string
 
 paths:
     /1.0/search.json:
@@ -126,6 +134,7 @@ paths:
                 - search
                 - person
                 - thirdparty
+                - household
             description: >
                 The search is performed across multiple entities. The entities must be listed into
                 `type` parameters.
@@ -151,6 +160,7 @@ paths:
                                 - person
                                 - thirdparty
                                 - user
+                                - household
             responses:
                 200:
                     description: "OK"
@@ -771,6 +781,18 @@ paths:
                     description: "accepted"
                 403:
                     description: "unauthorized"
+    /1.0/main/user-job.json:
+        get:
+            tags:
+                - user
+            summary: Return a list of all user jobs
+            responses:
+                200:
+                    description: "ok"
+                    content:
+                        application/json:
+                            schema:
+                                $ref: '#/components/schemas/UserJob'
     /1.0/main/civility.json:
         get:
             tags:
@@ -782,4 +804,3 @@ paths:
                 401:
                     description: "Unauthorized"
 
-