diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2018-01-01 09:14:49 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-01-01 09:14:49 +0000 |
commit | 4780e747711c74fbd7824f3209ccb2779b89cb88 (patch) | |
tree | 536759ef9dc97f889da267cab05a3344f3cdb937 | |
parent | ff077cf7dc5cfd7c6c6206d801ea3f326f7af1aa (diff) | |
parent | 8a75e49eec130942f5b0f9ee1f43158ef623a7e5 (diff) | |
download | gitlab-ce-4780e747711c74fbd7824f3209ccb2779b89cb88.tar.gz |
Merge branch 'jira-doc-resolution' into 'master'
Documenting that resolved JIRA tickets are not automatically transitioned
See merge request gitlab-org/gitlab-ce!16162
-rw-r--r-- | doc/user/project/integrations/jira.md | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/user/project/integrations/jira.md b/doc/user/project/integrations/jira.md index 7dc234a9759..f77569e4886 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 transitioned 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 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 [jira]: https://www.atlassian.com/software/jira |