Integrate new path-to-regexp with trailing optionals (#2644)

Fix #2497

Ref pillarjs/path-to-regexp#176
This commit is contained in:
Paul Melnikow
2019-01-08 18:50:47 -05:00
committed by GitHub
parent 4efe8832cf
commit d1c5378bf0
21 changed files with 41 additions and 75 deletions

View File

@@ -24,11 +24,7 @@ module.exports = class GitlabPipelineStatus extends BaseSvgScrapingService {
static get route() {
return {
base: 'gitlab/pipeline',
format: '([^/]+)/([^/]+)(?:/([^/]+))?',
capture: ['user', 'repo', 'branch'],
// Trailing optional parameters don't work. The issue relates to the `.`
// separator before the extension.
// pattern: ':user/:repo/:branch?',
pattern: ':user/:repo/:branch*',
queryParams: ['gitlab_url'],
}
}
@@ -43,7 +39,7 @@ module.exports = class GitlabPipelineStatus extends BaseSvgScrapingService {
},
{
title: 'Gitlab pipeline status (branch)',
pattern: ':user/:repo/:branch',
pattern: ':user/:repo/:branch*',
namedParams: {
user: 'gitlab-org',
repo: 'gitlab-ce',