diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-04-04 12:54:48 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-04-04 12:54:48 +0000 |
| commit | 3e663a24fe69427fb36ed0371672253e035afb51 (patch) | |
| tree | 8c771e46d1714de932cc4fab70dc0ff87c9cec15 | |
| parent | ea35b1193a7f0d9453818625735fddc83c294af7 (diff) | |
| parent | b1f386841ea0fcf08f33bda90b3dea49dac06c08 (diff) | |
| download | gitlab-ce-3e663a24fe69427fb36ed0371672253e035afb51.tar.gz | |
Merge branch '29670-jira-integration-documentation-improvment' into 'master'
Improves Jira integration documentation
Closes #29670
See merge request !10067
| -rw-r--r-- | changelogs/unreleased/29670-jira-integration-documentation-improvment.yml | 4 | ||||
| -rw-r--r-- | doc/user/project/integrations/img/jira_project_settings.png | bin | 0 -> 32791 bytes | |||
| -rw-r--r-- | doc/user/project/integrations/jira.md | 5 |
3 files changed, 9 insertions, 0 deletions
diff --git a/changelogs/unreleased/29670-jira-integration-documentation-improvment.yml b/changelogs/unreleased/29670-jira-integration-documentation-improvment.yml new file mode 100644 index 00000000000..8975f0b6ef3 --- /dev/null +++ b/changelogs/unreleased/29670-jira-integration-documentation-improvment.yml @@ -0,0 +1,4 @@ +--- +title: Added clarification to the Jira integration documentation. +merge_request: 10066 +author: Matthew Bender diff --git a/doc/user/project/integrations/img/jira_project_settings.png b/doc/user/project/integrations/img/jira_project_settings.png Binary files differnew file mode 100644 index 00000000000..cb6a6ba14ce --- /dev/null +++ b/doc/user/project/integrations/img/jira_project_settings.png diff --git a/doc/user/project/integrations/jira.md b/doc/user/project/integrations/jira.md index 4c64d1e0907..e02f81fd972 100644 --- a/doc/user/project/integrations/jira.md +++ b/doc/user/project/integrations/jira.md @@ -157,6 +157,11 @@ the same goal: where `PROJECT-1` is the issue ID of the JIRA project. +>**Note:** +- 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). + ### JIRA issue closing example Let's consider the following example: |
