diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2017-06-16 06:56:39 +0000 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2017-06-19 09:42:25 -0500 |
| commit | 96c44f5c434ed08358d774ad3ac73dbf250579b0 (patch) | |
| tree | 13435561f239cf02f031b3e24102f742b5201751 | |
| parent | 3b982fec2ae590c0ddb575ec6ec5ec155d64ae5e (diff) | |
| download | gitlab-ce-96c44f5c434ed08358d774ad3ac73dbf250579b0.tar.gz | |
Merge branch 'jira-integ-docs' into 'master'
Jira integ docs
See merge request !12196
| -rw-r--r-- | doc/user/project/integrations/img/jira_service_page.png | bin | 12228 -> 83466 bytes | |||
| -rw-r--r-- | doc/user/project/integrations/jira.md | 6 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/user/project/integrations/img/jira_service_page.png b/doc/user/project/integrations/img/jira_service_page.png Binary files differindex c74351b57b8..e69376f74c4 100644 --- a/doc/user/project/integrations/img/jira_service_page.png +++ b/doc/user/project/integrations/img/jira_service_page.png diff --git a/doc/user/project/integrations/jira.md b/doc/user/project/integrations/jira.md index a048260b033..d54c1fc78b4 100644 --- a/doc/user/project/integrations/jira.md +++ b/doc/user/project/integrations/jira.md @@ -98,14 +98,14 @@ in the table below. | Field | Description | | ----- | ----------- | | `Web URL` | The base URL to the JIRA instance web interface which is being linked to this GitLab project. E.g., `https://jira.example.com`. | -| `JIRA API URL` | The base URL to the JIRA instance API. Web URL value will be used if not set. E.g., `https://jira-api.example.com`. | -| `Project key` | The short identifier for your JIRA project, all uppercase, e.g., `PROJ`. | +| `JIRA API URL` | The base URL to the JIRA instance API. E.g., `https://jira-api.example.com`. This is optional. If not entered, the Web URL value be used. | +| `Project key` | Put a JIRA project key (in uppercase), e.g. `MARS` in this field. This is only for testing the configuration settings. JIRA integration in GitLab works with _all_ JIRA projects in your JIRA instance. This field will be removed in a future release. | | `Username` | The user name created in [configuring JIRA step](#configuring-jira). | | `Password` |The password of the user created in [configuring JIRA step](#configuring-jira). | | `JIRA issue transition` | This is the ID of a transition that moves issues to a closed state. You can find this number under JIRA workflow administration ([see screenshot](img/jira_workflow_screenshot.png)). **Closing JIRA issues via commits or Merge Requests won't work if you don't set the ID correctly.** | After saving the configuration, your GitLab project will be able to interact -with the linked JIRA project. +with all JIRA projects in your JIRA instance.  |
