Skip to content

Commit

Permalink
Merge branch 'develop' into issue#2270
Browse files Browse the repository at this point in the history
  • Loading branch information
Suyash878 authored Nov 19, 2024
2 parents 6144664 + e978dd7 commit 124127b
Show file tree
Hide file tree
Showing 8 changed files with 1,037 additions and 1,023 deletions.
2 changes: 1 addition & 1 deletion .github/dependabot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ updates:
labels:
- "dependencies"
# Specify the target branch for PRs
target-branch: "develop"
target-branch: "develop-postgres"
# Customize commit message prefix
commit-message:
prefix: "chore(deps):"
17 changes: 13 additions & 4 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,6 @@ Thanks for submitting a pull request! Please provide enough information so that

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

**Did you add tests for your changes?**

<!--Yes or No. Note: Add unit tests or automation tests for your code.-->

**Snapshots/Videos:**

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

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

## Checklist

### CodeRabbit AI Review
- [ ] I have reviewed and addressed all critical issues flagged by CodeRabbit AI
- [ ] I have implemented or provided justification for each non-critical suggestion
- [ ] I have documented my reasoning in the PR comments where CodeRabbit AI suggestions were not implemented

### Test Coverage
- [ ] I have written tests for all new changes/features
- [ ] I have verified that test coverage meets or exceeds 95%
- [ ] I have run the test suite locally and all tests pass


**Other information**

<!--Add extra information about this PR here-->
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: "Check if base branch is develop"
if: github.event.pull_request.base.ref != 'develop'
if: github.event.pull_request.base.ref != 'develop-postgres'
run: |
echo "PR is not against develop branch. Please refer PR_GUIDELINES.md"
echo "PR is not against develop-postgres branch. Please refer PR_GUIDELINES.md"
exit 1
10 changes: 6 additions & 4 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import * as graphqlEslint from "@graphql-eslint/eslint-plugin";
const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);
const compat = new FlatCompat({
baseDirectory: __dirname,
recommendedConfig: js.configs.recommended,
baseDirectory: __dirname,
recommendedConfig: js.configs.recommended
});

export default [
Expand Down Expand Up @@ -44,7 +44,9 @@ export default [

languageOptions: {
parser: tsParser,
globals: globals.node,
globals: {
...globals.node,
},
},
rules: {
"no-restricted-imports": [
Expand Down Expand Up @@ -142,7 +144,7 @@ export default [
},

languageOptions: {
parser: parser,
parser: graphqlEslint.parser,
},
},
{
Expand Down
Loading

0 comments on commit 124127b

Please sign in to comment.