Skip to content

Commit 48e94ea

Browse files
authored
Merge branch 'develop' into bug/@mui
2 parents 01db55f + 37cfbde commit 48e94ea

File tree

9 files changed

+1021
-1007
lines changed

9 files changed

+1021
-1007
lines changed

.github/dependabot.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ updates:
1212
labels:
1313
- "dependencies"
1414
# Specify the target branch for PRs
15-
target-branch: "develop"
15+
target-branch: "develop-postgres"
1616
# Customize commit message prefix
1717
commit-message:
1818
prefix: "chore(deps):"

.github/pull_request_template.md

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@ Thanks for submitting a pull request! Please provide enough information so that
2424

2525
Fixes #<!--Add related issue number here.-->
2626

27-
**Did you add tests for your changes?**
28-
29-
<!--Yes or No. Note: Add unit tests or automation tests for your code.-->
30-
3127
**Snapshots/Videos:**
3228

3329
<!--Add snapshots or videos wherever possible.-->
@@ -45,6 +41,19 @@ Fixes #<!--Add related issue number here.-->
4541

4642
<!-- If this PR introduces a breaking change, please describe the impact and a migration path for existing applications. -->
4743

44+
## Checklist
45+
46+
### CodeRabbit AI Review
47+
- [ ] I have reviewed and addressed all critical issues flagged by CodeRabbit AI
48+
- [ ] I have implemented or provided justification for each non-critical suggestion
49+
- [ ] I have documented my reasoning in the PR comments where CodeRabbit AI suggestions were not implemented
50+
51+
### Test Coverage
52+
- [ ] I have written tests for all new changes/features
53+
- [ ] I have verified that test coverage meets or exceeds 95%
54+
- [ ] I have run the test suite locally and all tests pass
55+
56+
4857
**Other information**
4958

5059
<!--Add extra information about this PR here-->

.github/workflows/pull-request.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ jobs:
318318
runs-on: ubuntu-latest
319319
steps:
320320
- name: "Check if base branch is develop"
321-
if: github.event.pull_request.base.ref != 'develop'
321+
if: github.event.pull_request.base.ref != 'develop-postgres'
322322
run: |
323-
echo "PR is not against develop branch. Please refer PR_GUIDELINES.md"
323+
echo "PR is not against develop-postgres branch. Please refer PR_GUIDELINES.md"
324324
exit 1

eslint.config.mjs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import * as graphqlEslint from "@graphql-eslint/eslint-plugin";
1414
const __filename = fileURLToPath(import.meta.url);
1515
const __dirname = path.dirname(__filename);
1616
const compat = new FlatCompat({
17-
baseDirectory: __dirname,
18-
recommendedConfig: js.configs.recommended,
17+
baseDirectory: __dirname,
18+
recommendedConfig: js.configs.recommended
1919
});
2020

2121
export default [
@@ -44,7 +44,9 @@ export default [
4444

4545
languageOptions: {
4646
parser: tsParser,
47-
globals: globals.node,
47+
globals: {
48+
...globals.node,
49+
},
4850
},
4951
rules: {
5052
"no-restricted-imports": [
@@ -142,7 +144,7 @@ export default [
142144
},
143145

144146
languageOptions: {
145-
parser: parser,
147+
parser: graphqlEslint.parser,
146148
},
147149
},
148150
{

0 commit comments

Comments
 (0)