Skip to content

Commit 834b8bd

Browse files
committed
20250518162056 Merge develop-postgres into develop
1 parent b5e7738 commit 834b8bd

File tree

4 files changed

+22
-14
lines changed

4 files changed

+22
-14
lines changed

.github/ISSUE_TEMPLATE/bug-report.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,6 @@ If applicable, add screenshots to help explain your problem.
3131
Add any other context or screenshots about the feature request here.
3232

3333
**Potential internship candidates**
34-
Please read [this](https://github.com/PalisadoesFoundation/talawa/issues/359) if you are planning to apply for a Palisadoes Foundation internship.
3534

35+
Please read this if you are planning to apply for a Palisadoes Foundation internship
36+
- https://github.com/PalisadoesFoundation/talawa/issues/359

.github/ISSUE_TEMPLATE/feature-request.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,6 @@ A clear and concise description of approach to be followed.
2323
Add any other context or screenshots about the feature request here.
2424

2525
**Potential internship candidates**
26-
Please read [this](https://github.com/PalisadoesFoundation/talawa/issues/359
27-
) if you are planning to apply for a Palisadoes Foundation internship.
26+
27+
Please read this if you are planning to apply for a Palisadoes Foundation internship
28+
- https://github.com/PalisadoesFoundation/talawa/issues/359

.github/dependabot.yaml

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
1-
# More information at this link: https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
1+
# Configuration for automated dependency updates using Dependabot
2+
version: 2
23
updates:
3-
- package-ecosystem: pnpm
4-
commit-message:
5-
include: scope
6-
prefix: "[pnpm]"
7-
directory: /
4+
# Define the target package ecosystem
5+
- package-ecosystem: "npm"
6+
# Specify the root directory
7+
directory: "/"
8+
# Schedule automated updates to run weekly
89
schedule:
9-
interval: monthly
10-
target-branch: develop-postgres
11-
version: 2
10+
interval: "monthly"
11+
# Labels to apply to Dependabot PRs
12+
labels:
13+
- "dependencies"
14+
# Specify the target branch for PRs
15+
target-branch: "develop-postgres"
16+
# Customize commit message prefix
17+
commit-message:
18+
prefix: "chore(deps):"

.github/pull_request_template.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@ This section can be deleted after reading.
44
We employ the following branching strategy to simplify the development process and to ensure that only stable code is pushed to the `master` branch:
55
66
- `develop`: For unstable code: New features and bug fixes.
7-
- `develop-postgres`: A temporary branch for development on the PostgreSQL.
87
- `master`: Where the stable production ready code lies. Only security related bugs.
98
109
NOTE!!!
1110
12-
ONLY SUBMIT PRS AGAINST OUR `DEVELOP-POSTGRES` BRANCH. THE DEFAULT IS `MAIN`, SO YOU WILL HAVE TO MODIFY THIS BEFORE SUBMITTING YOUR PR FOR REVIEW. PRS MADE AGAINST `MAIN` WILL BE CLOSED.
11+
ONLY SUBMIT PRS AGAINST OUR `DEVELOP` BRANCH. THE DEFAULT IS `MAIN`, SO YOU WILL HAVE TO MODIFY THIS BEFORE SUBMITTING YOUR PR FOR REVIEW. PRS MADE AGAINST `MAIN` WILL BE CLOSED.
1312
1413
-->
1514

0 commit comments

Comments
 (0)