From c630bced675a30cff568ccc2c0eb71ef0e61651a Mon Sep 17 00:00:00 2001 From: Edouard Date: Fri, 29 Dec 2017 11:09:49 +0000 Subject: [PATCH 1/2] Documenting that resolved JIRA tickets are not automatically transitioned --- doc/user/project/integrations/jira.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/user/project/integrations/jira.md b/doc/user/project/integrations/jira.md index 7dc234a9759..411547e9800 100644 --- a/doc/user/project/integrations/jira.md +++ b/doc/user/project/integrations/jira.md @@ -173,6 +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. ### JIRA issue closing example @@ -222,6 +223,10 @@ 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). + [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]: https://www.atlassian.com/software/jira From 8a75e49eec130942f5b0f9ee1f43158ef623a7e5 Mon Sep 17 00:00:00 2001 From: Edouard Date: Fri, 29 Dec 2017 12:58:03 +0000 Subject: [PATCH 2/2] Typos correction on the advise of @smcgivern --- doc/user/project/integrations/jira.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/user/project/integrations/jira.md b/doc/user/project/integrations/jira.md index 411547e9800..f77569e4886 100644 --- a/doc/user/project/integrations/jira.md +++ b/doc/user/project/integrations/jira.md @@ -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