Skip to content

Commit

Permalink
Merge branch 'main' into v1
Browse files Browse the repository at this point in the history
  • Loading branch information
RoshanMhatre committed Sep 3, 2024
2 parents caf6ea9 + a54a961 commit a567f3a
Show file tree
Hide file tree
Showing 11 changed files with 535 additions and 26 deletions.
10 changes: 10 additions & 0 deletions .github/workflows/pr_checks_config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
pr_checks:
title:
- name: 'prefix_check'
regex: '^(?i)(fix|feat|test|chore|refactor|build):'
message_if_not_matching: 'PR title must start with "fix:", "feat:", "chore:", "refactor:", or "test:" (case-insensitive)'

description:
- name: 'clickup_check'
regex: '(?i)app.clickup.com'
message_if_not_matching: 'PR description must contain a link to a ClickUp (case-insensitive)'
50 changes: 42 additions & 8 deletions reference/admin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1748,16 +1748,14 @@ components:
description: |
Full name of the delegatee.
start_at:
type: string
format: date-time
example: '2020-06-11T13:14:55.201598+00:00'
allOf:
- $ref: '#/components/schemas/timestamptz_utc'
description: |
Date and time from which the delegation is active.
nullable: false
end_at:
type: string
format: date-time
example: '2020-07-11T13:14:55.201598+00:00'
allOf:
- $ref: '#/components/schemas/timestamptz_utc'
description: |
Date and time till which the delegation is active. If null, delegation is active indefinitely.
nullable: true
Expand Down Expand Up @@ -1994,7 +1992,6 @@ components:
delegatees:
type: array
nullable: true
maxItems: 1
items:
$ref: '#/components/schemas/delegatees'
description: |
Expand Down Expand Up @@ -2061,6 +2058,27 @@ components:
nullable: true
description: Date-time in [ISO8601 format](https://xml2rfc.tools.ietf.org/public/rfc/html/rfc3339.html#anchor14).
example: '2020-06-01T01:18:19.292-08:00'
delegatee:
type: object
additionalProperties: false
properties:
user_id:
type: string
description: |
User ID of the delegatee.
example: uswjwgnwwgo
start_at:
allOf:
- $ref: '#/components/schemas/timestamptz_utc'
description: |
Date and time from which the delegation is active.
nullable: false
end_at:
allOf:
- $ref: '#/components/schemas/timestamptz_utc'
description: |
Date and time till which the delegation is active. If null, delegation is active indefinitely.
nullable: true
invitation_in:
type: object
additionalProperties: false
Expand Down Expand Up @@ -2208,7 +2226,16 @@ components:
example:
- delegatee@example.com
description: |
List of emails of employees that are delegatees for this employee.
This key is in the process of being deprecated. It is recommended to use `delegatees` key instead.
deprecated: true
delegatees:
type: array
maxItems: 5
nullable: false
items:
$ref: '#/components/schemas/delegatee'
description: |
List of delegatees for this employee.
employee_id:
type: string
maxLength: 255
Expand Down Expand Up @@ -3547,6 +3574,7 @@ components:
- is_physical_bill_submitted
- physical_bill_submitted_at
- invoice_number
- is_duplicate_present
properties:
id:
allOf:
Expand Down Expand Up @@ -4032,6 +4060,12 @@ components:
example: 1234
commute_details:
$ref: '#/components/schemas/commute_details'
is_duplicate_present:
type: boolean
nullable: false
description: |
Whether duplicate expenses is detected for this expense or not.
example: true
source:
type: string
description: |
Expand Down
7 changes: 7 additions & 0 deletions reference/approver.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1815,6 +1815,7 @@ components:
- is_physical_bill_submitted
- physical_bill_submitted_at
- invoice_number
- is_duplicate_present
properties:
id:
allOf:
Expand Down Expand Up @@ -2300,6 +2301,12 @@ components:
example: 1234
commute_details:
$ref: '#/components/schemas/commute_details'
is_duplicate_present:
type: boolean
nullable: false
description: |
Whether duplicate expenses is detected for this expense or not.
example: true
source:
type: string
description: |
Expand Down
Loading

0 comments on commit a567f3a

Please sign in to comment.