Skip to content

Commit

Permalink
Merge from develop (PalisadoesFoundation#2702)
Browse files Browse the repository at this point in the history
* 20250110082849 Deleted all files in the main branch in anticipation of merging develop into main cleanly

* 20250110082850 Merge develop into main
  • Loading branch information
palisadoes authored Jan 10, 2025
1 parent 0b22a2e commit 01e0910
Show file tree
Hide file tree
Showing 104 changed files with 19,065 additions and 485 deletions.
29 changes: 18 additions & 11 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ This section can be deleted after reading.
We employ the following branching strategy to simplify the development process and to ensure that only stable code is pushed to the `master` branch:
- `develop`: For unstable code: New features and bug fixes.
- `master`: Where the stable production ready code lies. Only security related bugs.
- `master`: Where the stable production-ready code lies. Only security-related bugs.
NOTE!!!
Expand All @@ -15,39 +15,46 @@ ONLY SUBMIT PRS AGAINST OUR `DEVELOP` BRANCH. THE DEFAULT IS `MAIN`, SO YOU WILL
Thanks for submitting a pull request! Please provide enough information so that others can review your pull request.
-->

**What kind of change does this PR introduce?**
### What kind of change does this PR introduce?

<!-- E.g. a bugfix, feature, refactoring, etc… -->

**Issue Number:**
### Issue Number:

Fixes #<!--Add related issue number here and delete this comment text block.-->

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

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

**Snapshots/Videos:**
- [ ] Tests are written for all changes made in this PR.
- [ ] Test coverage meets or exceeds the current coverage (~90/95%).

Snapshots/Videos:

<!--Add snapshots or videos wherever possible.-->

**If relevant, did you update the documentation?**
### If relevant, did you update the documentation?

<!--Add link to Talawa-Docs.-->

**Summary**
### Summary

<!-- Explain the **motivation** for making this change. What existing problem does the pull request solve? -->
<!-- Explain the motivation for making this change. What existing problem does the pull request solve? -->
<!-- Try to link to an open issue for more information. -->

**Does this PR introduce a breaking change?**
### Does this PR introduce a breaking change?

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

**Other information**
### Checklist for Repository Standards
- [ ] Have you reviewed and implemented all applicable `coderaabbitai` review suggestions?
- [ ] Have you ensured that the PR aligns with the repository’s contribution guidelines?

### Other information

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

**Have you read the [contributing guide](https://github.com/PalisadoesFoundation/talawa/blob/master/CONTRIBUTING.md)?**
### Have you read the [contributing guide](https://github.com/PalisadoesFoundation/talawa/blob/master/CONTRIBUTING.md)?

<!--Yes or No-->
17 changes: 17 additions & 0 deletions .github/workflows/auto-label.json5
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
labelsSynonyms: {
dependencies: ["dependencies", "dependabot", "dependency"],
security: ["security"],
"good first issue": [
"security",
"dependencies",
"dependabot",
"dependency",
"layout",
"screen",
"design",
"figma",
],
"ui/ux": ["layout", "screen", "design", "figma"],
},
}
40 changes: 40 additions & 0 deletions .github/workflows/issue.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
##############################################################################
##############################################################################
#
# NOTE!
#
# Please read the README.md file in this directory that defines what should
# be placed in this file
#
##############################################################################
##############################################################################

name: Issues Workflow
on:
issues:
types: ["opened"]
jobs:
Opened-issue-label:
name: Adding Issue Label
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
sparse-checkout: |
.github/workflows/auto-label.json5
sparse-checkout-cone-mode: false

- uses: Renato66/auto-label@v2.3.0
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
ignore-comments: true
default-labels: '["unapproved"]'

Issue-Greeting:
name: Greeting Message to User
runs-on: ubuntu-latest
steps:
- uses: actions/first-interaction@v1
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
issue-message: "Congratulations on making your first Issue! :confetti_ball: If you haven't already, check out our [Contributing Guidelines](https://github.com/PalisadoesFoundation/talawa/blob/develop/CONTRIBUTING.md) and [Issue Reporting Guidelines](https://github.com/PalisadoesFoundation/talawa/blob/develop/ISSUE_GUIDELINES.md) to ensure that you are following our guidelines for contributing and making issues."
2 changes: 1 addition & 1 deletion .github/workflows/issues.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
name: Adding Issue Label
runs-on: ubuntu-latest
steps:
- uses: Renato66/auto-label@v2.3.0
- uses: Renato66/auto-label@v3
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
ignore-comments: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull-request-target.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
### Testing Your Code
Remember, your PRs won't be reviewed until these criteria are met:
1. We don't merge PRs with poor code quality.
1. Follow coding best practices such that CodeRabbit.ai approves your PR.
1. We don't merge PRs with failed tests.
Expand Down
Loading

0 comments on commit 01e0910

Please sign in to comment.