summaryrefslogtreecommitdiff
path: root/doc/integration
diff options
context:
space:
mode:
authorFelipe Artur <felipefac@gmail.com>2016-11-17 16:10:25 -0200
committerAchilleas Pipinellis <axilleas@axilleas.me>2016-11-22 13:02:44 +0100
commitd85d9533b1b60cc17796a7a471192d4b37f41473 (patch)
treed243b18b7a0afeb482d7146a6a4076215899136c /doc/integration
parent264eda9f744f82173da4aac756643ac498b5b6a3 (diff)
downloadgitlab-ce-d85d9533b1b60cc17796a7a471192d4b37f41473.tar.gz
Add remove links to JIRA documentation
Diffstat (limited to 'doc/integration')
-rw-r--r--doc/integration/img/jira_issue_reference.pngbin36188 -> 49151 bytes
-rw-r--r--doc/integration/img/jira_service_close_comment.pngbin0 -> 29716 bytes
-rw-r--r--doc/integration/img/jira_service_close_issue.pngbin79569 -> 89666 bytes
-rw-r--r--doc/integration/jira.md7
4 files changed, 5 insertions, 2 deletions
diff --git a/doc/integration/img/jira_issue_reference.png b/doc/integration/img/jira_issue_reference.png
index 1a2d9f04a6c..463200da6aa 100644
--- a/doc/integration/img/jira_issue_reference.png
+++ b/doc/integration/img/jira_issue_reference.png
Binary files differ
diff --git a/doc/integration/img/jira_service_close_comment.png b/doc/integration/img/jira_service_close_comment.png
new file mode 100644
index 00000000000..84a71c692b1
--- /dev/null
+++ b/doc/integration/img/jira_service_close_comment.png
Binary files differ
diff --git a/doc/integration/img/jira_service_close_issue.png b/doc/integration/img/jira_service_close_issue.png
index eed69e80d2c..b033b210469 100644
--- a/doc/integration/img/jira_service_close_issue.png
+++ b/doc/integration/img/jira_service_close_issue.png
Binary files differ
diff --git a/doc/integration/jira.md b/doc/integration/jira.md
index 2e31fd994de..4c1b8b2bdd3 100644
--- a/doc/integration/jira.md
+++ b/doc/integration/jira.md
@@ -54,16 +54,19 @@ contains the improvement and in merge request description we say that this
merge request `Closes PROJECT-7` issue.
Once this merge request is merged, the JIRA issue will be automatically closed
-with a link to the commit that resolved the issue.
+with a comment and a associated link to the commit that resolved the issue.
![A Git commit that causes the JIRA issue to be closed](img/jira_merge_request_close.png)
---
-![The GitLab integration user leaves a comment on JIRA](img/jira_service_close_issue.png)
+![The GitLab integration closes JIRA issue](img/jira_service_close_issue.png)
---
+![The GitLab integration creates a comment and a link on JIRA issue.](img/jira_service_close_comment.png)
+
+
## Configuration
### Configuring JIRA