Skip to content

Commit

Permalink
Force push to dev
Browse files Browse the repository at this point in the history
  • Loading branch information
fourjr committed Nov 1, 2020
1 parent d74f8c8 commit c605d68
Show file tree
Hide file tree
Showing 35 changed files with 1,638 additions and 3,261 deletions.
3 changes: 2 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
TOKEN=MyBotToken
LOG_URL=https://logviewername.herokuapp.com/
GUILD_ID=1234567890
MODMAIL_GUILD_ID=1234567890
OWNERS=Owner1ID,Owner2ID,Owner3ID
MONGO_URI=mongodb+srv://mongodburi
CONNECTION_URI=mongodb+srv://mongodburi
File renamed without changes.
17 changes: 8 additions & 9 deletions CONTRIBUTING.md → .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,33 +15,32 @@ We use GitHub to host code, to track issues and feature requests, as well as acc

## We Use [Git Flow](https://atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow)
![Simple Image Of A Git Flow Workflow](https://nvie.com/img/[email protected])
When contributing to this project please make sure you follow this and name your branches appropriately!
When contributing to this project, please make sure you follow this and name your branches appropriately!

## All Code Changes Happen Through Pull Requests
Make sure you know how Git Flow works before contributing!
Pull requests are the best way to propose changes to the codebase. We actively welcome your pull requests:

1. Fork the repo and create your branch from `master` or `development` according to Git Flow.
2. If you've added code that should be tested, add tests.
3. If you've changed APIs, update the documentation.
4. Ensure the test suite passes.
5. Make sure your code lints.
6. Issue that pull request!
2. Update the CHANGELOG.
3. If you've changed `core/*` or `bot.py`, mark changelog as "BREAKING" since plugins may break.
4. Make sure your code passes the lint checks.
5. Create Issues and pull requests!

## Any contributions you make will be under the GNU Affero General Public License v3.0
In short, when you submit code changes, your submissions are understood to be under the same [GNU Affero General Public License v3.0](https://www.gnu.org/licenses/agpl-3.0.en.html) that covers the project. Feel free to contact the maintainers if that's a concern.

## Report bugs using [Github Issues](https://github.com/kyb3r/modmail/issues)
We use GitHub issues to track public bugs. Report a bug by [opening a new issue](https://github.com/kyb3r/modmail/issues/new); it's that easy!
We use GitHub issues to track public bugs. Report a bug by [opening a new Issue](https://github.com/kyb3r/modmail/issues/new); it's that easy!

## Write bug reports with detail, background, and sample code
**Great Bug Reports** tend to have:

- A quick summary and/or background
- A quick summary and background
- Steps to reproduce
- Be specific!
- What you expected would happen
- What actually happens
- What *actually* happens
- Notes (possibly including why you think this might be happening, or stuff you tried that didn't work)


Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/command-request.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
name: Command request
about: Request a new command
title: "[COMMAND-REQUEST] your title here"
title: "your title here"
labels: command-request
assignees: ''

Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
name: Feature request
about: Suggest an idea for this project
title: "[FEATURE-REQUEST] your title here"
title: "your title here"
labels: feature-request
assignees: ''

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lints.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ jobs:
continue-on-error: true
- name: Black and flake8
run: |
black . --check
black . --diff
17 changes: 0 additions & 17 deletions .github/workflows/stale.yml

This file was deleted.

17 changes: 0 additions & 17 deletions .lint.py

This file was deleted.

Loading

0 comments on commit c605d68

Please sign in to comment.