Skip to content

Commit 09e0f3e

Browse files
committed
Merge branch 'release-1.0.3' into release
2 parents b1d2f62 + 3502844 commit 09e0f3e

File tree

4 files changed

+33
-18
lines changed

4 files changed

+33
-18
lines changed

.github/PULL_REQUEST_TEMPLATE.md

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
Fixes #issue-number
2+
13
I have verified that this pull request:
24

35
* [ ] has no linting errors (`npm run lint`)

client/modules/IDE/pages/FullView.jsx

+3-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import * as ProjectActions from '../actions/project';
1010

1111
class FullView extends React.Component {
1212
componentDidMount() {
13-
this.props.getProject(this.props.params.project_id);
13+
this.props.getProject(this.props.params.project_id, this.props.params.username);
1414
}
1515

1616
ident = () => {}
@@ -56,7 +56,8 @@ class FullView extends React.Component {
5656

5757
FullView.propTypes = {
5858
params: PropTypes.shape({
59-
project_id: PropTypes.string
59+
project_id: PropTypes.string,
60+
username: PropTypes.string
6061
}).isRequired,
6162
project: PropTypes.shape({
6263
name: PropTypes.string,

developer_docs/development.md

+21-16
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ A guide for adding code to this project.
66
- [Installation](#installation)
77
- [Development Workflow](#development-workflow)
88
- [Tests](#tests)
9-
- [Writing Git Commit Messages](#writing-git-commit-messages)
10-
- [Tips](#tips)
9+
- [Committing Code](#committing-code)
10+
- [General Rules](#general-rules)
11+
- [Commit Messages](#commit-messages)
1112
- [Design](#design)
1213
- [Technologies Used](#technologies-used)
1314

@@ -31,41 +32,45 @@ To run the test suite simply run `npm test` (after installing dependencies with
3132

3233
A sample unit test could be found here: [Nav.test.jsx](../client/components/__test__/Nav.test.jsx).
3334

34-
## Writing Git Commit Messages
35+
## Committing Code
36+
Inspired by [Git/GitHub commit standards & conventions](https://gist.github.com/digitaljhelms/3761873).
3537

3638
Good commit messages serve at least three important purposes:
3739

3840
* They speed up the reviewing process.
3941
* They help us write good release notes.
4042
* They help future maintainers understand your change and the reasons behind it.
4143

44+
45+
### General Rules
46+
* Make [atomic commits](http://en.wikipedia.org/wiki/Atomic_commit) of changes, even across multiple files, in logical units. That is, as much as possible, each commit should be focused on one specific purpose.
47+
* As much as possible, make sure a commit does not contain unnecessary whitespace changes. This can be checked as follows:
48+
49+
```
50+
$ git diff --check
51+
```
52+
53+
### Commit Messages
54+
4255
Structure your commit message like this:
4356

4457
```
45-
Short (50 chars or less) summary of changes ( involving Fixes #Issue-number keyword )
58+
[#issueid] Short (50 chars or less) summary of changes
4659
47-
More detailed explanatory text, if necessary. Wrap it to about 72
48-
characters or so. In some contexts, the first line is treated as the
49-
subject of an email and the rest of the text as the body. The blank
50-
line separating the summary from the body is critical (unless you omit
51-
the body entirely); tools like rebase can get confused if you run the
52-
two together.
60+
More detailed explanatory text, if necessary. Wrap it to about 72 characters or so. In some contexts, the first line is treated as the subject of an email and the rest of the text as the body. The blank line separating the summary from the body is critical (unless you omit the body entirely); tools like rebase can get confused if you run the two together.
5361
5462
Further paragraphs come after blank lines.
5563
5664
- Bullet points are okay, too
5765
58-
- Typically a hyphen or asterisk is used for the bullet, preceded by a
59-
single space, with blank lines in between, but conventions vary here
66+
- Typically a hyphen or asterisk is used for the bullet, preceded by a single space, with blank lines in between, but conventions vary here
6067
```
61-
6268
* Write the summary line and description of what you have done in the imperative mode, that is as if you were commanding someone. Start the line with "Fix", "Add", "Change" instead of "Fixed", "Added", "Changed".
69+
* Link the GitHub issue you are working on in the summary line in brackets, e.g. [#123]
6370
* Always leave the second line blank.
6471
* Be as descriptive as possible in the description. It helps reasoning about the intention of commits and gives more context about why changes happened.
65-
66-
### Tips
67-
6872
* If it seems difficult to summarize what your commit does, it may be because it includes several logical changes or bug fixes, and are better split up into several commits using `git add -p`.
73+
* Note that you can connect multiple issues to a commit, if necessary: `[#123][#456] Add Button component`
6974

7075
## Design
7176
- [Style Guide/Design System on Figma](https://github.com/processing/p5.js-web-editor/labels/good%20medium%20issues)

developer_docs/release.md

+7
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,13 @@ This project release guide is based on
1919
7. `$ git push && git push --tags`
2020
8. `$ git checkout develop`
2121
9. `$ git merge --no-ff release-<newversion>`
22+
10. Create a release on GitHub. You can do this in one of two ways:
23+
1. (Preferred) Use the [`hub` command line tool](https://hub.github.com/). You can automate adding all commit messages since the last release with the following command:
24+
```sh
25+
$ hub release create -d -m "<newversion>" -m "$(git log `git describe --tags --abbrev=0 HEAD^`..HEAD --oneline)" <newversion>`
26+
```
27+
Note that this creates a draft release, which you can then edit on GitHub. This allows you to create release notes from the list of commit messages, but then edit these notes as you wish.
28+
2. [Draft a new release on Github](https://github.com/processing/p5.js-web-editor/releases/new).
2229

2330
Travis CI will automatically deploy the release to production, as well as push a production tagged Docker image to DockerHub.
2431

0 commit comments

Comments
 (0)