summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axilleas@axilleas.me>2017-04-04 12:54:48 +0000
committerAchilleas Pipinellis <axilleas@axilleas.me>2017-04-04 12:54:48 +0000
commit3e663a24fe69427fb36ed0371672253e035afb51 (patch)
tree8c771e46d1714de932cc4fab70dc0ff87c9cec15 /doc
parentea35b1193a7f0d9453818625735fddc83c294af7 (diff)
parentb1f386841ea0fcf08f33bda90b3dea49dac06c08 (diff)
downloadgitlab-ce-3e663a24fe69427fb36ed0371672253e035afb51.tar.gz
Merge branch '29670-jira-integration-documentation-improvment' into 'master'
Improves Jira integration documentation Closes #29670 See merge request !10067
Diffstat (limited to 'doc')
-rw-r--r--doc/user/project/integrations/img/jira_project_settings.pngbin0 -> 32791 bytes
-rw-r--r--doc/user/project/integrations/jira.md5
2 files changed, 5 insertions, 0 deletions
diff --git a/doc/user/project/integrations/img/jira_project_settings.png b/doc/user/project/integrations/img/jira_project_settings.png
new file mode 100644
index 00000000000..cb6a6ba14ce
--- /dev/null
+++ b/doc/user/project/integrations/img/jira_project_settings.png
Binary files differ
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: