Files
Neil Lathwood 1ee2e8e0e0 Updated to use new theme for docs site (#9320)
* Updated to use new theme for docs site

* Updated theme location

* Removed librenms.css

* Updated index page + re-added librenms.css

* Use built in theme modification

* flexbox grid, dump bootstrap

* tidy up things

* Added path and updated deploy script + mkdocs config

* Removed db schmea changes

* Updated to install python/pip 3

* Removed pip3 install

* Pip3 install

* Updated deploy-docs

* Updated deploy-docs
2018-10-27 23:04:34 +01:00

29 lines
1006 B
Markdown

source: Developing/Merging-Pull-Requests.md
path: blob/master/doc/
# Merging Pull Requests
### GitHub
We will now build the monthly change log from our GitHub commits. When merging a commit, please
ensure you:
- Click the `Merge pull request` button
- Give the merge a descriptive but short title
- For the commit message prepend it with one of the following tags for the pull request to appear in the changelog:
- devices: or newdevice: For new device support.
- feature: or feat: To indicate this is a new or updated feature
- webui: or web: To indicate this is an update to the WebUI
- fix: or bugfix: To show this is a bug fix.
- refactoring: or refactor: When the changes are refactoring a large portion of code
- You can reference an issue number with `#xyz`, i.e `#1234`
- Use the `Confirm squash and merge` button to merge.
### Example commits
#### Feature
feature: Added new availability map #4401
#### New device
newdevice: Added support for Cisco ASA #4402