diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-01-30 04:24:13 +0300 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2018-02-14 23:10:50 +0300 |
| commit | 74b3192a295f907a03b5e8c70105c18d066f295b (patch) | |
| tree | 570d8e3ec0e4fa3c244040b0526abdf6768eaed1 /app | |
| parent | 3ad0ee8bc2b1a1a5f9522e943371c6e8fda802d4 (diff) | |
Merge branch 'sh-fix-jira-trailing-slash' into 'master'
Fix JIRA not working when a trailing slash is included
Closes #42494
See merge request gitlab-org/gitlab-ce!16748
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/project_services/jira_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/project_services/jira_service.rb b/app/models/project_services/jira_service.rb index 2be35b6ea9d..23147d7f666 100644 --- a/app/models/project_services/jira_service.rb +++ b/app/models/project_services/jira_service.rb @@ -43,7 +43,7 @@ class JiraService < IssueTrackerService username: self.username, password: self.password, site: URI.join(url, '/').to_s, - context_path: url.path, + context_path: url.path.chomp('/'), auth_type: :basic, read_timeout: 120, use_cookies: true, |