Skip to content

Commit

Permalink
Merge branch 'main' into 3178-broken-kube-services
Browse files Browse the repository at this point in the history
  • Loading branch information
zc-devs committed Jan 20, 2024
2 parents 7f7e628 + dc73471 commit 2ccec8f
Show file tree
Hide file tree
Showing 9 changed files with 268 additions and 269 deletions.
4 changes: 0 additions & 4 deletions .github/ISSUE_TEMPLATE/bug_report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,9 @@ body:
options:
# - label: Follow our [Code of Conduct](https://github.com/woodpecker-ci/woodpecker/blob/main/CODE_OF_CONDUCT.md)
# required: true
- label: Read the [Contributing Guidelines](https://github.com/woodpecker-ci/woodpecker/blob/main/CONTRIBUTING.md).
required: true
- label: Read the [docs](https://woodpecker-ci.org/docs/intro).
required: true
- label: Check that there isn't [already an issue](https://github.com/woodpecker-ci/woodpecker/issues) that reports the same bug to avoid creating a duplicate.
required: true
- label: Checked that the bug isn't fixed in the `next` version already [https://woodpecker-ci.org/faq#which-version-of-woodpecker-should-i-use]
required: true
- label: Check that this is a concrete bug. For Q&A join our [Discord Chat Server](https://discord.gg/fcMQqSMXJy) or the [Matrix room](https://matrix.to/#/#woodpecker:matrix.org).
required: true
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,6 @@ contact_links:
- name: Frequently Asked Questions
url: https://woodpecker-ci.org/faq
about: Check the FAQs for common questions.
- name: Support
url: https://github.com/woodpecker-ci/.github/blob/main/SUPPORT.md
about: Information about how you can get support.
2 changes: 0 additions & 2 deletions .github/ISSUE_TEMPLATE/feature_request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ body:
# required: true
- label: Checked that the feature isn't part of the `next` version already [https://woodpecker-ci.org/faq#which-version-of-woodpecker-should-i-use]
required: true
- label: Read the [Contributing Guidelines](https://github.com/woodpecker-ci/woodpecker/blob/main/CONTRIBUTING.md).
required: true
- label: Read the [docs](https://woodpecker-ci.org/docs/intro).
required: true
- label: Check that there isn't already an [issue](https://github.com/woodpecker-ci/woodpecker/issues) that request the same feature to avoid creating a duplicate.
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ repos:
entry: YAML filenames must have .yaml extension.
language: fail
files: .yml$
exclude: '^.gitpod.yml$'
exclude: '^(.gitpod.yml|.github/ISSUE_TEMPLATE/config.yml)$'

ci:
autofix_commit_msg: |
Expand Down
2 changes: 1 addition & 1 deletion .woodpecker/docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ variables:
- &node_image 'docker.io/node:21-alpine'
- &xgo_image 'docker.io/techknowlogick/xgo:go-1.21.5'
- &xgo_version 'go-1.21.2'
- &buildx_plugin 'docker.io/woodpeckerci/plugin-docker-buildx:2.3.0'
- &buildx_plugin 'docker.io/woodpeckerci/plugin-docker-buildx:3.0.0'
- &platforms_release 'linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/386,linux/amd64,linux/ppc64le,linux/riscv64,linux/s390x,freebsd/arm64,freebsd/amd64,openbsd/arm64,openbsd/amd64'
- &platforms_server 'linux/arm/v7,linux/arm64/v8,linux/amd64,linux/ppc64le,linux/riscv64'
- &platforms_preview 'linux/amd64'
Expand Down
6 changes: 3 additions & 3 deletions server/forge/bitbucket/internal/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ const (
pathStatus = "%s/2.0/repositories/%s/%s/commit/%s/statuses/build"
pathBranches = "%s/2.0/repositories/%s/%s/refs/branches?%s"
pathOrgPerms = "%s/2.0/workspaces/%s/permissions?%s"
pathPullRequests = "%s/2.0/repositories/%s/%s/pullrequests"
pathPullRequests = "%s/2.0/repositories/%s/%s/pullrequests?%s"
pathBranchCommits = "%s/2.0/repositories/%s/%s/commits/%s"
pathDir = "%s/2.0/repositories/%s/%s/src/%s%s"
)
Expand Down Expand Up @@ -235,8 +235,8 @@ func (c *Client) GetUserWorkspaceMembership(workspace, user string) (string, err

func (c *Client) ListPullRequests(owner, name string, opts *ListOpts) ([]*PullRequest, error) {
out := new(PullRequestResp)
uri := fmt.Sprintf(pathPullRequests, c.base, owner, name)
_, err := c.do(uri, get, opts.Encode(), out)
uri := fmt.Sprintf(pathPullRequests, c.base, owner, name, opts.Encode())
_, err := c.do(uri, get, nil, out)
return out.Values, err
}

Expand Down
66 changes: 33 additions & 33 deletions web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,54 +18,54 @@
},
"dependencies": {
"@intlify/unplugin-vue-i18n": "^2.0.0",
"@kyvg/vue3-notification": "^3.0.0",
"@vueuse/core": "^10.5.0",
"ansi_up": "^6.0.0",
"dayjs": "^1.11.9",
"@kyvg/vue3-notification": "^3.1.3",
"@vueuse/core": "^10.7.2",
"ansi_up": "^6.0.2",
"dayjs": "^1.11.10",
"fuse.js": "^7.0.0",
"js-base64": "^3.7.5",
"js-base64": "^3.7.6",
"lodash": "^4.17.21",
"node-emoji": "^2.0.0",
"pinia": "^2.1.4",
"node-emoji": "^2.1.3",
"pinia": "^2.1.7",
"prismjs": "^1.29.0",
"semver": "^7.5.4",
"vue": "^3.3.4",
"vue-i18n": "^9.2.2",
"vue-router": "^4.2.2"
"vue": "^3.4.15",
"vue-i18n": "^9.9.0",
"vue-router": "^4.2.5"
},
"devDependencies": {
"@iconify/json": "^2.2.131",
"@types/lodash": "^4.14.195",
"@types/node": "^20.0.0",
"@iconify/json": "^2.2.171",
"@types/lodash": "^4.14.202",
"@types/node": "^20.11.5",
"@types/node-emoji": "^1.8.2",
"@types/prismjs": "^1.26.0",
"@types/prismjs": "^1.26.3",
"@types/semver": "^7.5.6",
"@typescript-eslint/eslint-plugin": "^6.8.0",
"@typescript-eslint/parser": "^6.8.0",
"@vitejs/plugin-vue": "^5.0.0",
"@vue/compiler-sfc": "^3.3.6",
"eslint": "^8.44.0",
"@typescript-eslint/eslint-plugin": "^6.19.0",
"@typescript-eslint/parser": "^6.19.0",
"@vitejs/plugin-vue": "^5.0.3",
"@vue/compiler-sfc": "^3.4.15",
"eslint": "^8.56.0",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-config-airbnb-typescript": "^17.0.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-import": "^2.29.0",
"eslint-plugin-prettier": "^5.0.0",
"eslint-config-airbnb-typescript": "^17.1.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-promise": "^6.1.1",
"eslint-plugin-simple-import-sort": "^10.0.0",
"eslint-plugin-vue": "^9.17.0",
"eslint-plugin-vue-scoped-css": "^2.5.0",
"prettier": "^3.0.0",
"replace-in-file": "^7.0.2",
"eslint-plugin-vue": "^9.20.1",
"eslint-plugin-vue-scoped-css": "^2.7.2",
"prettier": "^3.2.4",
"replace-in-file": "^7.1.0",
"tinycolor2": "^1.6.0",
"typescript": "5.3.3",
"unplugin-icons": "^0.18.0",
"unplugin-icons": "^0.18.2",
"unplugin-vue-components": "^0.26.0",
"vite": "^5.0.0",
"vite": "^5.0.12",
"vite-plugin-prismjs": "^0.0.8",
"vite-plugin-windicss": "^1.9.0",
"vite-svg-loader": "^5.0.0",
"vue-eslint-parser": "^9.3.1",
"vue-tsc": "^1.8.19",
"vite-plugin-windicss": "^1.9.3",
"vite-svg-loader": "^5.1.0",
"vue-eslint-parser": "^9.4.0",
"vue-tsc": "^1.8.27",
"windicss": "^3.5.6"
},
"pnpm": {
Expand Down
Loading

0 comments on commit 2ccec8f

Please sign in to comment.