diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7716d4fa8..088f65d38 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -5,7 +5,7 @@ repos: - id: check-hooks-apply - id: check-useless-excludes - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.5.0 + rev: v4.6.0 hooks: - id: end-of-file-fixer - id: trailing-whitespace diff --git a/.woodpecker/binaries.yaml b/.woodpecker/binaries.yaml index 73c589f0b..2109c4840 100644 --- a/.woodpecker/binaries.yaml +++ b/.woodpecker/binaries.yaml @@ -2,7 +2,7 @@ when: event: tag variables: - - &golang_image 'docker.io/golang:1.22.1' + - &golang_image 'docker.io/golang:1.22.2' - &node_image 'docker.io/node:21-alpine' - &xgo_image 'docker.io/techknowlogick/xgo:go-1.22.1' - &xgo_version 'go-1.21.2' diff --git a/.woodpecker/docker.yaml b/.woodpecker/docker.yaml index d1a5eea94..592a2030a 100644 --- a/.woodpecker/docker.yaml +++ b/.woodpecker/docker.yaml @@ -1,5 +1,5 @@ variables: - - &golang_image 'docker.io/golang:1.22.1' + - &golang_image 'docker.io/golang:1.22.2' - &node_image 'docker.io/node:21-alpine' - &xgo_image 'docker.io/techknowlogick/xgo:go-1.22.1' - &xgo_version 'go-1.21.2' diff --git a/go.mod b/go.mod index 3911834ec..45ce43c98 100644 --- a/go.mod +++ b/go.mod @@ -27,7 +27,7 @@ require ( github.com/go-ap/httpsig v0.0.0-20221203064646-3647b4d88fdf github.com/go-sql-driver/mysql v1.8.1 github.com/golang-jwt/jwt/v5 v5.2.1 - github.com/google/go-github/v60 v60.0.0 + github.com/google/go-github/v61 v61.0.0 github.com/google/tink/go v1.7.0 github.com/gorilla/securecookie v1.1.2 github.com/jellydator/ttlcache/v3 v3.2.0 diff --git a/go.sum b/go.sum index 10da8303d..be0b36f2a 100644 --- a/go.sum +++ b/go.sum @@ -191,8 +191,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/go-github/v60 v60.0.0 h1:oLG98PsLauFvvu4D/YPxq374jhSxFYdzQGNCyONLfn8= -github.com/google/go-github/v60 v60.0.0/go.mod h1:ByhX2dP9XT9o/ll2yXAu2VD8l5eNVg8hD4Cr0S/LmQk= +github.com/google/go-github/v61 v61.0.0 h1:VwQCBwhyE9JclCI+22/7mLB1PuU9eowCXKY5pNlu1go= +github.com/google/go-github/v61 v61.0.0/go.mod h1:0WR+KmsWX75G2EbpyGsGmradjo3IiciuI4BmdVCobQY= github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= diff --git a/server/forge/github/convert.go b/server/forge/github/convert.go index 5fcc352ab..d7dd9e531 100644 --- a/server/forge/github/convert.go +++ b/server/forge/github/convert.go @@ -18,7 +18,7 @@ package github import ( "fmt" - "github.com/google/go-github/v60/github" + "github.com/google/go-github/v61/github" "go.woodpecker-ci.org/woodpecker/v2/server/model" ) diff --git a/server/forge/github/convert_test.go b/server/forge/github/convert_test.go index 7894cd00b..0d74417ea 100644 --- a/server/forge/github/convert_test.go +++ b/server/forge/github/convert_test.go @@ -19,7 +19,7 @@ import ( "testing" "github.com/franela/goblin" - "github.com/google/go-github/v60/github" + "github.com/google/go-github/v61/github" "go.woodpecker-ci.org/woodpecker/v2/server/model" ) diff --git a/server/forge/github/github.go b/server/forge/github/github.go index d48fec314..74734b1cc 100644 --- a/server/forge/github/github.go +++ b/server/forge/github/github.go @@ -26,7 +26,7 @@ import ( "strconv" "strings" - "github.com/google/go-github/v60/github" + "github.com/google/go-github/v61/github" "github.com/rs/zerolog/log" "golang.org/x/oauth2" diff --git a/server/forge/github/parse.go b/server/forge/github/parse.go index 4d47b10cc..d6a5fb669 100644 --- a/server/forge/github/parse.go +++ b/server/forge/github/parse.go @@ -22,7 +22,7 @@ import ( "net/http" "strings" - "github.com/google/go-github/v60/github" + "github.com/google/go-github/v61/github" "go.woodpecker-ci.org/woodpecker/v2/server/forge/types" "go.woodpecker-ci.org/woodpecker/v2/server/model" diff --git a/web/src/assets/locales/de.json b/web/src/assets/locales/de.json index a9731e1aa..4e394674a 100644 --- a/web/src/assets/locales/de.json +++ b/web/src/assets/locales/de.json @@ -391,6 +391,10 @@ "public": "Öffentlich" }, "visibility": "Sichtbarkeit des Projekts" + }, + "allow_deploy": { + "allow": "Deployments erlauben", + "desc": "Deployments von erolgreichen Pipelines erlauben. Nur benutzen, wenn du allen Nutzern mit Push-Zugriff vertraust." } }, "not_allowed": "Zugriff auf die Einstellungen dieses Repositories nicht erlaubt",