diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-01-31 23:06:25 +0300 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-01-31 23:06:25 +0300 |
| commit | 3a565d5d3a0cc610ea0bd114125606bed6e4dc34 (patch) | |
| tree | 1012e38a6efa6edf2f26b1acf17f94e8e38de6d1 /app/models/project_services | |
| parent | e25f383ddc6b867dc4010be10518d79c663d7409 (diff) | |
| parent | 560c93e60efd0ae5a1a6bed68a1ee3e74bf23737 (diff) | |
Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480
* master: (119 commits)
[ci skip] Fix example commands to refer to the correct versions
Use axios instead of jquery ajax for setCiStatusFavicon
refactor groups controller to match EE
Fix broken test
Introduce a new QA::Gitlab::Page::Component::Dropzone class
Gitaly Server info for admin panel
Add note about being in the `qa` directory for `bin/qa` to work
Remove N+1 queries with /projects/:project_id/{access_requests,members} API endpoints
Fix not all events being shown in group dashboard
Add support for PreReceiveError in UserMergeBranch RPC
Migrate Git::Repository#delete_refs to Gitaly
Replace $.get in render math with axios
Move mr widget related links into a vue file
Make those files as close as EE to reduce conflicts
Don't assume postgresql in two initializers
Move Repository#can_be_merged? to Gitlab::Git::Repository
Remove brakeman from .codeclimate.yml since it's now covered by the sast CI job
Update Nokogiri to 1.8.2
Ignore conflicts in db/schema.rb in Gitlab::EeCompatCheck
Remove Rugged exception in cache rescue
...
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, |