diff options
| author | techknowlogick <techknowlogick@gitea.io> | 2019-07-06 21:28:09 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-06 21:28:09 -0400 |
| commit | d0ec940dd7b79876c91288be54e8fd62eb42fe54 (patch) | |
| tree | fb378674d89e02aeca8de4b399c32ffc31f81a93 /go.mod | |
| parent | c44f0b1c760855f578d2e5ce6fafbf9cba97da4f (diff) | |
| download | gitea-d0ec940dd7b79876c91288be54e8fd62eb42fe54.tar.gz gitea-d0ec940dd7b79876c91288be54e8fd62eb42fe54.zip | |
switch to use gliderlabs/ssh for builtin server (#7250)
resolves git conflicts from #3896 (credit to @belak, in case github doesn't keep original author during squash)
Co-Authored-By: Matti Ranta <techknowlogick@gitea.io>
Diffstat (limited to 'go.mod')
| -rw-r--r-- | go.mod | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -40,7 +40,7 @@ require ( github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 // indirect github.com/facebookgo/stats v0.0.0-20151006221625-1b76add642e4 // indirect github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870 // indirect - github.com/gliderlabs/ssh v0.1.4 // indirect + github.com/gliderlabs/ssh v0.2.2 github.com/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd // indirect github.com/glycerine/goconvey v0.0.0-20190315024820-982ee783a72e // indirect github.com/go-macaron/binding v0.0.0-20160711225916-9440f336b443 @@ -110,11 +110,11 @@ require ( github.com/yohcop/openid-go v0.0.0-20160914080427-2c050d2dae53 go.etcd.io/bbolt v1.3.2 // indirect golang.org/x/crypto v0.0.0-20190618222545-ea8f1a30c443 - golang.org/x/net v0.0.0-20190613194153-d28f0bde5980 + golang.org/x/net v0.0.0-20190619014844-b5b0513f8c1b golang.org/x/oauth2 v0.0.0-20181101160152-c453e0c75759 - golang.org/x/sys v0.0.0-20190618155005-516e3c20635f + golang.org/x/sys v0.0.0-20190620070143-6f217b454f45 golang.org/x/text v0.3.2 - golang.org/x/tools v0.0.0-20190618163018-fdf1049a943a // indirect + golang.org/x/tools v0.0.0-20190620154339-431033348dd0 // indirect gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect gopkg.in/asn1-ber.v1 v1.0.0-20150924051756-4e86f4367175 // indirect gopkg.in/bufio.v1 v1.0.0-20140618132640-567b2bfa514e // indirect |