diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-01-25 23:59:28 +0100 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-01-25 23:59:28 +0100 |
| commit | fbc988de54e7e87cde2828a43942181907a42c7d (patch) | |
| tree | 1c1b8b9b063e3d3aa8c2a11c0ce3d6b11ffb4f5f | |
| parent | 81d79c7f0a8e8bd54cf39a886ab89ec4532f34b1 (diff) | |
| download | gitlab-ce-fbc988de54e7e87cde2828a43942181907a42c7d.tar.gz | |
Remove old JIRA reference
| -rw-r--r-- | doc/project_services/jira.md | 14 | ||||
| -rw-r--r-- | doc/project_services/jira_old.md | 40 |
2 files changed, 2 insertions, 52 deletions
diff --git a/doc/project_services/jira.md b/doc/project_services/jira.md index c733e4b2e9b..17b9d59d439 100644 --- a/doc/project_services/jira.md +++ b/doc/project_services/jira.md @@ -81,16 +81,14 @@ password as they will be needed when configuring GitLab in the next section. ### Configuring GitLab +_**Note:** The currently supported JIRA versions are v6.x and v7.x._ + Assuming you [have already configured JIRA](#configuring-jira), now it's time to configure GitLab. JIRA configuration in GitLab is done via a project's [**Services**](../project_services/project_services.md). -#### GitLab 7.8 and up - -_**Note:** The currently supported JIRA versions are v6.x and v7.x._ - To enable JIRA integration in a project, navigate to the project's **Settings > Services > JIRA**. @@ -114,14 +112,6 @@ with the linked JIRA project. --- -#### GitLab 6.x-7.7 with JIRA v6.x - -_**Note:** GitLab versions 7.8 and up contain various integration improvements. -We strongly recommend upgrading._ - -In the unfortunate event that you are still using GitLab < 7.8, consult the -[jira_old document](jira_old.md) on how to configure JIRA. - ## JIRA issues By now you should have [configured JIRA](#configuring-jira) and enabled the diff --git a/doc/project_services/jira_old.md b/doc/project_services/jira_old.md deleted file mode 100644 index 2813b142de2..00000000000 --- a/doc/project_services/jira_old.md +++ /dev/null @@ -1,40 +0,0 @@ -# GitLab 6.x-7.7 with JIRA v6.x - -**NOTE: This method is deprecated. GitLab versions 7.8 and up, contain various -integration improvements and we strongly recommend upgrading. The official -supported document on JIRA integration can be found under [JIRA](jira.md).** - ---- - -In `gitlab.yml` enable the JIRA issue tracker section by -[uncommenting these lines][jira-gitlab-yml]. This will make sure that all -issues within GitLab are pointing to the JIRA issue tracker. - -After you set this, you will be able to close issues in JIRA by a commit in -GitLab. - -Go to your project's **Settings** page and fill in the project name for the -JIRA project: - - - ---- - -You can also enable the JIRA service that will allow you to interact with JIRA -issues. Go to the **Settings > Services > JIRA** and: - -1. Tick the active check box to enable the service -1. Supply the URL to JIRA server, for example https://jira.example.com -1. Supply the username of a user we created under `Configuring JIRA` section, - for example `gitlab` -1. Supply the password of the user -1. Optional: supply the JIRA API version, default is version `2` -1. Optional: supply the JIRA issue transition ID (issue transition to closed). - This is dependent on JIRA settings, default is `2` -1. Hit save - - - - - -[jira-gitlab-yml]: https://gitlab.com/subscribers/gitlab-ee/blob/6-8-stable-ee/config/gitlab.yml.example#L111-115 |