diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-04-07 11:38:39 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-04-07 11:38:39 +0000 |
| commit | 01c8bf389397783a31ce819d3894ea6c0cbc02b0 (patch) | |
| tree | e9a472b615425ff1e7b0627e15dd4ca067dffe40 | |
| parent | dca2aaaf6ba03f6491b04e7df912f2f1bc156fb1 (diff) | |
| parent | 48d4edd637860d0be97aab6a2e34f61996f3aeca (diff) | |
| download | gitlab-ce-01c8bf389397783a31ce819d3894ea6c0cbc02b0.tar.gz | |
Merge branch '28574-jira-trigers' into 'master'
Remove confusing placeholder for JIRA transition_id
Closes #28574
See merge request !10421
| -rw-r--r-- | app/models/project_services/jira_service.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/28574-jira-trigers.yml | 4 | ||||
| -rw-r--r-- | doc/user/project/integrations/jira.md | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/app/models/project_services/jira_service.rb b/app/models/project_services/jira_service.rb index 3b90fd1c2c7..97e997d3899 100644 --- a/app/models/project_services/jira_service.rb +++ b/app/models/project_services/jira_service.rb @@ -91,7 +91,7 @@ class JiraService < IssueTrackerService { type: 'text', name: 'project_key', placeholder: 'Project Key' }, { type: 'text', name: 'username', placeholder: '' }, { type: 'password', name: 'password', placeholder: '' }, - { type: 'text', name: 'jira_issue_transition_id', placeholder: '2' } + { type: 'text', name: 'jira_issue_transition_id', placeholder: '' } ] end diff --git a/changelogs/unreleased/28574-jira-trigers.yml b/changelogs/unreleased/28574-jira-trigers.yml new file mode 100644 index 00000000000..6ebd2c0c2c2 --- /dev/null +++ b/changelogs/unreleased/28574-jira-trigers.yml @@ -0,0 +1,4 @@ +--- +title: Remove confusing placeholder for JIRA transition_id +merge_request: +author: diff --git a/doc/user/project/integrations/jira.md b/doc/user/project/integrations/jira.md index e02f81fd972..f611029afdc 100644 --- a/doc/user/project/integrations/jira.md +++ b/doc/user/project/integrations/jira.md @@ -101,7 +101,7 @@ in the table below. | `Project key` | The short identifier for your JIRA project, all uppercase, e.g., `PROJ`. | | `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)). | +| `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. |