diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2018-01-30 14:50:17 +0000 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2018-01-30 14:50:17 +0000 |
| commit | 07557a946bac1b596a28293d39e7bd2581ff828b (patch) | |
| tree | f725f935880b122862880f9f18d18fb74a7f758b /app/models/project_services | |
| parent | bf01452cc361842dab7442a9ad868213d53bd212 (diff) | |
| parent | 03f386c2b20f95272e4846f5ecab54fd8b2566e0 (diff) | |
| download | gitlab-ce-qa-define-selectors.tar.gz | |
Merge branch 'master' into 'qa-define-selectors'qa-define-selectors
# Conflicts:
# qa/qa/page/group/show.rb
Diffstat (limited to 'app/models/project_services')
| -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, |