Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[@sanity/client] Fix spelling errors #1658

Merged
merged 1 commit into from
Dec 11, 2019
Merged

[@sanity/client] Fix spelling errors #1658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@ npm start
- The code is linted and the test suite is passing

- It's fine to open a pull request to start a discussion / ask for help, but it should be stated clearly that it's not yet ready for merge.
- When the `next`-branch is throughly tested and ready to be released (either as a minor or major version bump), it should be merged into master and bumped.
- Critical fixes goes straight into master (preferably through a pull request)
- When the `next`-branch is thoroughly tested and ready to be released (either as a minor or major version bump), it should be merged into master and bumped.
- Critical fixes go straight into master (preferably through a pull request)

## Merging

Prefer squash + merge. If it makes sense to keep individual commits (e.g. different people has been working on the same feature), the pull request should be merged with the "Rebase + merge"-button. If possible, each individual commit message should be rewritten with the pull-request number in paranthesis, e.g. `[some-package] Fix stuff (#22)`
Prefer squash + merge. If it makes sense to keep individual commits (e.g. different people has been working on the same feature), the pull request should be merged with the "Rebase + merge"-button. If possible, each individual commit message should be rewritten with the pull-request number in parenthesis, e.g. `[some-package] Fix stuff (#22)`

## Publishing official releases

Expand Down
2 changes: 1 addition & 1 deletion packages/@sanity/client/src/assets/assetsClient.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ assign(AssetsClient.prototype, {
* @param {String} opts.label Label
* @param {String} opts.title Title
* @param {String} opts.description Description
* @param {String} opts.creditLine The credit to person(s) and/or organisation(s) required by the supplier of the image to be used when published
* @param {String} opts.creditLine The credit to person(s) and/or organization(s) required by the supplier of the image to be used when published
* @param {Object} opts.source Source data (when the asset is from an external service)
* @param {String} opts.source.id The (u)id of the asset within the source, i.e. 'i-f323r1E'
* Required if source is defined
Expand Down