Skip to content

Commit da6ecc3

Browse files
authored
Merge branch 'master' into patch-1
2 parents e529aed + 8fbd955 commit da6ecc3

File tree

3 files changed

+127
-74
lines changed

3 files changed

+127
-74
lines changed

lib/resolve-config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ export default (
4040
userGitlabUrl && userGitlabApiPathPrefix
4141
? urlJoin(userGitlabUrl, userGitlabApiPathPrefix)
4242
: service === "gitlab" && CI_API_V4_URL
43-
? CI_API_V4_URL
44-
: urlJoin(defaultedGitlabUrl, isNil(userGitlabApiPathPrefix) ? "/api/v4" : userGitlabApiPathPrefix),
43+
? CI_API_V4_URL
44+
: urlJoin(defaultedGitlabUrl, isNil(userGitlabApiPathPrefix) ? "/api/v4" : userGitlabApiPathPrefix),
4545
assets: assets ? castArray(assets) : assets,
4646
milestones: milestones ? castArray(milestones) : milestones,
4747
successComment,

package-lock.json

Lines changed: 124 additions & 71 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"ava": "5.3.1",
3636
"c8": "8.0.1",
3737
"nock": "13.3.8",
38-
"prettier": "3.0.3",
38+
"prettier": "3.1.0",
3939
"semantic-release": "22.0.7",
4040
"sinon": "17.0.1",
4141
"tempy": "1.0.1"

0 commit comments

Comments
 (0)