Skip to content

Commit 264d63e

Browse files
ashmckenzieIgor Drozdov
and
Igor Drozdov
committed
Merge branch 'id-bump-text' into 'main'
Clean up go.sum by updating libraries in go.mod See merge request https://gitlab.com/gitlab-org/gitlab-shell/-/merge_requests/692 Merged-by: Ash McKenzie <[email protected]> Approved-by: Alejandro Rodríguez <[email protected]> Approved-by: Ash McKenzie <[email protected]> Co-authored-by: Igor Drozdov <[email protected]>
2 parents 59acf61 + 9cb8406 commit 264d63e

File tree

2 files changed

+20
-664
lines changed

2 files changed

+20
-664
lines changed

go.mod

+8-6
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,15 @@ require (
1010
github.com/mikesmitty/edkey v0.0.0-20170222072505-3356ea4e686a
1111
github.com/otiai10/copy v1.4.2
1212
github.com/pires/go-proxyproto v0.6.2
13-
github.com/prometheus/client_golang v1.12.2
13+
github.com/prometheus/client_golang v1.13.1
1414
github.com/sirupsen/logrus v1.9.0
1515
github.com/stretchr/testify v1.8.0
1616
gitlab.com/gitlab-org/gitaly/v15 v15.4.0-rc2
1717
gitlab.com/gitlab-org/labkit v1.16.0
1818
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa
1919
golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f
2020
google.golang.org/grpc v1.48.0
21+
google.golang.org/protobuf v1.28.1
2122
gopkg.in/yaml.v2 v2.4.0
2223
)
2324

@@ -59,8 +60,8 @@ require (
5960
github.com/pkg/errors v0.9.1 // indirect
6061
github.com/pmezard/go-difflib v1.0.0 // indirect
6162
github.com/prometheus/client_model v0.2.0 // indirect
62-
github.com/prometheus/common v0.32.1 // indirect
63-
github.com/prometheus/procfs v0.7.3 // indirect
63+
github.com/prometheus/common v0.37.0 // indirect
64+
github.com/prometheus/procfs v0.8.0 // indirect
6465
github.com/sebest/xff v0.0.0-20210106013422-671bd2870b3a // indirect
6566
github.com/shirou/gopsutil/v3 v3.21.2 // indirect
6667
github.com/tinylib/msgp v1.1.2 // indirect
@@ -72,17 +73,18 @@ require (
7273
go.uber.org/atomic v1.9.0 // indirect
7374
golang.org/x/net v0.0.0-20220531201128-c960675eff93 // indirect
7475
golang.org/x/oauth2 v0.0.0-20220309155454-6242fa91716a // indirect
75-
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect
76-
golang.org/x/text v0.3.7 // indirect
76+
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
77+
golang.org/x/text v0.3.8 // indirect
7778
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
7879
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
7980
google.golang.org/api v0.74.0 // indirect
8081
google.golang.org/appengine v1.6.7 // indirect
8182
google.golang.org/genproto v0.0.0-20220401170504-314d38edb7de // indirect
82-
google.golang.org/protobuf v1.28.1 // indirect
8383
gopkg.in/DataDog/dd-trace-go.v1 v1.32.0 // indirect
8484
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
8585
gopkg.in/yaml.v3 v3.0.1 // indirect
8686
)
8787

8888
replace golang.org/x/crypto => gitlab.com/gitlab-org/golang-crypto v0.0.0-20220616060731-4818747c9fed
89+
90+
exclude github.com/prometheus/client_golang v1.12.1

0 commit comments

Comments
 (0)