Skip to content

Commit

Permalink
Merge pull request #646 from pgrimaud/master
Browse files Browse the repository at this point in the history
Fix typos
  • Loading branch information
fcollonval committed May 26, 2020
2 parents bd87296 + f336ca6 commit c34abef
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ If you have suggestions on how these processes can be improved, please suggest t

## Bug Report

If you are using this software and encounter some behavior that is unexpected, then you may have come accross a bug!
If you are using this software and encounter some behavior that is unexpected, then you may have come across a bug!
To get this fixed, first creation an issue that should have, ideally:

* The behavior you expected
Expand Down
2 changes: 1 addition & 1 deletion specification/Git_REST_API.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Contents for each call include:

### /all_history - Get all git information of current repository

Request with a current_path. If the current_path is a git repository, return all the git repository information. This request contains 4 seperate requests on server side (show_top_level, branch, log, status)
Request with a current_path. If the current_path is a git repository, return all the git repository information. This request contains 4 separate requests on server side (show_top_level, branch, log, status)
and may fail individually, so each request has its own code to indicate execution status (zero for success, non-zero for failure)
URL:

Expand Down
2 changes: 1 addition & 1 deletion specification/Git_REST_API.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ paths:
Request with a current_path. If the current_path is a git repo,
return all the git repo information with a code of zero. If the current_path is not a git repo,
return error message with a non-zero code.
This request contains 4 seperate requests on server side (showtoplevel, branch, log, status)
This request contains 4 separate requests on server side (showtoplevel, branch, log, status)
and may fail individually, so each request has its own code to indicate execution status
(zero for success, none-zero for failure)
parameters:
Expand Down
2 changes: 1 addition & 1 deletion src/components/diff/NbDiff.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ export class NBDiff extends React.Component<IDiffProps, INBDiffState> {
}

/**
* Based on the Diff Context , calls the server API with the revant paremeters
* Based on the Diff Context , calls the server API with the revant parameters
* to
* @param diffContext the context in which to perform the diff
*/
Expand Down
2 changes: 1 addition & 1 deletion tests/test-components/PastCommitNode.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ describe('PastCommitNode', () => {
expect(node.text()).toMatch(props.commit.commit_msg);
});

test('Includes only relevent branch info', () => {
test('Includes only relevant branch info', () => {
const node = shallow(<PastCommitNode {...props} />);
expect(node.text()).toMatch('name3');
expect(node.text()).toMatch('name4');
Expand Down

0 comments on commit c34abef

Please sign in to comment.