|
@@ -1,7 +1,7 @@
|
|
|
Index: src/github.com/gogits/gogs/models/repo.go
|
|
Index: src/github.com/gogits/gogs/models/repo.go
|
|
|
---- src/github.com/gogits/gogs/models/repo.go.orig 2016-10-23 01:18:34.000000000 +0200
|
|
|
|
|
-+++ src/github.com/gogits/gogs/models/repo.go 2016-10-23 15:00:08.256062557 +0200
|
|
|
|
|
-@@ -561,9 +561,17 @@
|
|
|
|
|
|
|
+--- src/github.com/gogits/gogs/models/repo.go.orig 2017-02-10 20:16:17.000000000 +0100
|
|
|
|
|
++++ src/github.com/gogits/gogs/models/repo.go 2017-02-10 23:27:50.657968000 +0100
|
|
|
|
|
+@@ -567,9 +567,17 @@
|
|
|
repo.Owner = repo.MustOwner()
|
|
repo.Owner = repo.MustOwner()
|
|
|
cl := new(CloneLink)
|
|
cl := new(CloneLink)
|
|
|
if setting.SSH.Port != 22 {
|
|
if setting.SSH.Port != 22 {
|
|
@@ -22,8 +22,8 @@ Index: src/github.com/gogits/gogs/models/repo.go
|
|
|
cl.HTTPS = ComposeHTTPSCloneURL(repo.Owner.Name, repoName)
|
|
cl.HTTPS = ComposeHTTPSCloneURL(repo.Owner.Name, repoName)
|
|
|
return cl
|
|
return cl
|
|
|
Index: src/github.com/gogits/gogs/models/ssh_key.go
|
|
Index: src/github.com/gogits/gogs/models/ssh_key.go
|
|
|
---- src/github.com/gogits/gogs/models/ssh_key.go.orig 2016-10-23 01:18:34.000000000 +0200
|
|
|
|
|
-+++ src/github.com/gogits/gogs/models/ssh_key.go 2016-10-23 14:50:43.086101570 +0200
|
|
|
|
|
|
|
+--- src/github.com/gogits/gogs/models/ssh_key.go.orig 2017-02-10 20:16:17.000000000 +0100
|
|
|
|
|
++++ src/github.com/gogits/gogs/models/ssh_key.go 2017-02-10 23:30:52.795096000 +0100
|
|
|
@@ -29,7 +29,7 @@
|
|
@@ -29,7 +29,7 @@
|
|
|
)
|
|
)
|
|
|
|
|
|
|
@@ -36,9 +36,9 @@ Index: src/github.com/gogits/gogs/models/ssh_key.go
|
|
|
@@ -85,7 +85,7 @@
|
|
@@ -85,7 +85,7 @@
|
|
|
|
|
|
|
|
// AuthorizedString returns formatted public key string for authorized_keys file.
|
|
// AuthorizedString returns formatted public key string for authorized_keys file.
|
|
|
- func (key *PublicKey) AuthorizedString() string {
|
|
|
|
|
-- return fmt.Sprintf(_TPL_PUBLICK_KEY, setting.AppPath, key.ID, setting.CustomConf, key.Content)
|
|
|
|
|
-+ return fmt.Sprintf(_TPL_PUBLICK_KEY, "@l_prefix@/sbin/gogs-serv", key.ID, setting.CustomConf, key.Content)
|
|
|
|
|
|
|
+ func (k *PublicKey) AuthorizedString() string {
|
|
|
|
|
+- return fmt.Sprintf(_TPL_PUBLICK_KEY, setting.AppPath, k.ID, setting.CustomConf, k.Content)
|
|
|
|
|
++ return fmt.Sprintf(_TPL_PUBLICK_KEY, "@l_prefix@/sbin/gogs-serv", k.ID, setting.CustomConf, k.Content)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- func extractTypeFromBase64Key(key string) (string, error) {
|
|
|
|
|
|
|
+ // IsDeployKey returns true if the public key is used as deploy key.
|