Skip to content

Commit b9a5c13

Browse files
committed
Merge branch 'hotfix/2.4.1'
2 parents d56b71f + 0545f3f commit b9a5c13

File tree

5 files changed

+16
-14
lines changed

5 files changed

+16
-14
lines changed

.github/CONTRIBUTING.md

+11-5
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,21 @@
22

33
I want to thank you for sparing a time to improve this project! Here are some guidelines for contributing:
44

5-
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.
5+
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.
66

77
Generally, contribute to the project by:
88

9-
1. Fork this project.
10-
2. Create a new branch `my-new-feature`(or `fix-a-bug`), then complete the development, commit and push.
11-
3. Submit a new `Pull Request`.
9+
1. Fork this project on GitHub and clone it locally.
10+
2. Create a new branch named `feature/my-feature` (or `feature/fix-a-bug`), which branch from `develop`:
1211

12+
```console
13+
$ git checkout -b feature/<my-feature> develop
14+
```
15+
> Please note that the new branch name must include the prefix `feature/`.
16+
17+
3. After completing the development, commit and push to remote.
18+
4. Submit a new **pull request** to the `develop` branch of upstream, i.e., `cotes2020/jekyll-theme-chirpy:develop`.
1319

1420
---
1521

16-
:tada:Your volunteering will make the open source world more beautiful, thanks again!:tada:
22+
:tada: Your volunteering will make the open source world more beautiful, thanks again! :tada:

.github/ISSUE_TEMPLATE/feature_request.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ labels: enhancement
1111
- [ ] I have read the [contributing guidelines](https://github.com/cotes2020/jekyll-theme-chirpy/blob/master/.github/CONTRIBUTING.md).
1212
- [ ] There are no similar request on existing issues (including closed ones).
1313
- [ ] I have read the [project progress](https://github.com/cotes2020/jekyll-theme-chirpy/projects) and know the current progress of the project.
14-
- [ ] I was in the `master` branch of the latest code.
14+
- [ ] I was in the `develop` branch of the latest code.
1515

1616

1717
## Is your feature request related to a problem? Please describe

.github/ISSUE_TEMPLATE/question.md

+3-5
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,14 @@ labels: question
77
<!-- Note: Please follow the template to open a new issue, otherwise your question will probably be ignored. -->
88

99
## Checklist
10+
1011
<!-- Please complete the following list of tasks, and then check it by change the "[ ]" to "[x]" -->
12+
1113
- [ ] I have read the [tutorials](https://chirpy.cotes.info/categories/tutorial/) and know the correct effect of the functional design.
1214
- [ ] There are no similar question on existing issues (including closed ones).
1315
- [ ] I searched the Internet for related problems, but still couldn't solve it.
1416
- [ ] My question is based on the latest code of `master` branch.
1517

1618

17-
## I don't understand what the ReadMe/Wiki says
18-
<!-- Point out the parts that are hard for you to understand. -->
19-
20-
21-
## I have other questions
19+
## Description
2220
<!-- Please describe your question. -->

.github/workflows/ci.yml

-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
name: 'Continuous Integration'
22
on:
33
push:
4-
branches-ignore:
5-
- stable
64
tags-ignore:
75
- '*'
86
paths-ignore:

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ script:
2323
- bash _cibuild.sh
2424

2525
branches:
26-
only: stable
26+
only: master
2727

2828
git:
2929
depth: false # for posts lastmod

0 commit comments

Comments
 (0)