Commit 8a75e49e authored by Edouard's avatar Edouard

Typos correction on the advise of @smcgivern

parent c630bced
...@@ -173,7 +173,7 @@ where `PROJECT-1` is the issue ID of the JIRA project. ...@@ -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 - 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 close an issue in Jira. You can change your projects default branch under
[project settings](img/jira_project_settings.png). [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 ### JIRA issue closing example
...@@ -223,9 +223,9 @@ JIRA issue references and update comments will not work if the GitLab issue trac ...@@ -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 Make sure the `Transition ID` you set within the JIRA settings matches the one
your project needs to close a ticket. your project needs to close a ticket.
Make sure that the JIRA issue is not already marked as resolved, in other word that 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 striked through in the JIRA issue resolution field is not set. (It should not be struck through in
JIRA lists). JIRA lists.)
[services-templates]: services_templates.md [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 [jira-repo-old-docs]: https://gitlab.com/gitlab-org/gitlab-ce/blob/8-13-stable/doc/project_services/jira.md
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment