Typos correction on the advise of @smcgivern

This commit is contained in:
Edouard 2017-12-29 12:58:03 +00:00
parent c630bced67
commit 8a75e49eec
1 changed files with 4 additions and 4 deletions

View File

@ -173,7 +173,7 @@ where `PROJECT-1` is the issue ID of the JIRA project.
- Only commits and merges into the project's default branch (usually **master**) will
close an issue in Jira. You can change your projects default branch under
[project settings](img/jira_project_settings.png).
- The JIRA issue will not be transitionned if it has a resolution.
- The JIRA issue will not be transitioned if it has a resolution.
### JIRA issue closing example
@ -223,9 +223,9 @@ JIRA issue references and update comments will not work if the GitLab issue trac
Make sure the `Transition ID` you set within the JIRA settings matches the one
your project needs to close a ticket.
Make sure that the JIRA issue is not already marked as resolved, in other word that
the JIRA issue resolution field is not set. (It should not be striked through in
JIRA lists).
Make sure that the JIRA issue is not already marked as resolved, in other words that
the JIRA issue resolution field is not set. (It should not be struck through in
JIRA lists.)
[services-templates]: services_templates.md
[jira-repo-old-docs]: https://gitlab.com/gitlab-org/gitlab-ce/blob/8-13-stable/doc/project_services/jira.md