Merge tag 'v2.4.1' into develop

use git-flow to improve development
This commit is contained in:
Cotes Chung 2020-07-26 18:31:56 +08:00
commit 4cff8879ac
5 changed files with 16 additions and 14 deletions

View file

@ -2,14 +2,20 @@
I want to thank you for sparing a time to improve this project! Here are some guidelines for contributing I want to thank you for sparing a time to improve this project! Here are some guidelines for contributing
To ensure that the blog design is not confused, this project does not accept suggestions for design changes, such as color scheme, fonts, typography, etc. If your request is about an enhancement, it is recommended to first submit a `Feature Request` type issue to discuss whether your idea fits the project. To ensure that the blog design is not confused, this project does not accept suggestions for design changes, such as color scheme, fonts, typography, etc. If your request is about an enhancement, it is recommended to first submit a [`Feature Request`](https://github.com/cotes2020/jekyll-theme-chirpy/issues/new?labels=enhancement&template=feature_request.md) issue to discuss whether your idea fits the project.
Generally, contribute to the project by: Generally, contribute to the project by:
1. Fork this project. 1. Fork this project on GitHub and clone it locally.
2. Create a new branch `my-new-feature`(or `fix-a-bug`), then complete the development, commit and push. 2. Create a new branch named `feature/my-feature` (or `feature/fix-a-bug`), which branch from `develop`:
3. Submit a new `Pull Request`.
```console
$ git checkout -b feature/<my-feature> develop
```
> Please note that the new branch name must include the prefix `feature/`.
3. After completing the development, commit and push to remote.
4. Submit a new **pull request** to the `develop` branch of upstream, i.e., `cotes2020/jekyll-theme-chirpy:develop`.
--- ---

View file

@ -11,7 +11,7 @@ labels: enhancement
- [ ] I have read the [contributing guidelines](https://github.com/cotes2020/jekyll-theme-chirpy/blob/master/.github/CONTRIBUTING.md). - [ ] I have read the [contributing guidelines](https://github.com/cotes2020/jekyll-theme-chirpy/blob/master/.github/CONTRIBUTING.md).
- [ ] There are no similar request on existing issues (including closed ones). - [ ] There are no similar request on existing issues (including closed ones).
- [ ] I have read the [project progress](https://github.com/cotes2020/jekyll-theme-chirpy/projects) and know the current progress of the project. - [ ] I have read the [project progress](https://github.com/cotes2020/jekyll-theme-chirpy/projects) and know the current progress of the project.
- [ ] I was in the `master` branch of the latest code. - [ ] I was in the `develop` branch of the latest code.
## Is your feature request related to a problem? Please describe ## Is your feature request related to a problem? Please describe

View file

@ -7,16 +7,14 @@ labels: question
<!-- Note: Please follow the template to open a new issue, otherwise your question will probably be ignored. --> <!-- Note: Please follow the template to open a new issue, otherwise your question will probably be ignored. -->
## Checklist ## Checklist
<!-- Please complete the following list of tasks, and then check it by change the "[ ]" to "[x]" --> <!-- Please complete the following list of tasks, and then check it by change the "[ ]" to "[x]" -->
- [ ] I have read the [tutorials](https://chirpy.cotes.info/categories/tutorial/) and know the correct effect of the functional design. - [ ] I have read the [tutorials](https://chirpy.cotes.info/categories/tutorial/) and know the correct effect of the functional design.
- [ ] There are no similar question on existing issues (including closed ones). - [ ] There are no similar question on existing issues (including closed ones).
- [ ] I searched the Internet for related problems, but still couldn't solve it. - [ ] I searched the Internet for related problems, but still couldn't solve it.
- [ ] My question is based on the latest code of `master` branch. - [ ] My question is based on the latest code of `master` branch.
## I don't understand what the ReadMe/Wiki says ## Description
<!-- Point out the parts that are hard for you to understand. -->
## I have other questions
<!-- Please describe your question. --> <!-- Please describe your question. -->

View file

@ -1,8 +1,6 @@
name: 'Continuous Integration' name: 'Continuous Integration'
on: on:
push: push:
branches-ignore:
- stable
tags-ignore: tags-ignore:
- '*' - '*'
paths-ignore: paths-ignore:

View file

@ -23,7 +23,7 @@ script:
- bash _cibuild.sh - bash _cibuild.sh
branches: branches:
only: stable only: master
git: git:
depth: false # for posts lastmod depth: false # for posts lastmod