Skip to content

Commit 5d430c9

Browse files
tboergertboerger
authored
Merge pull request #108 from go-gitea/go-sdk
Replaced gogits go-gogs-client with go-sdk
2 parents ee963f6 + 4c6c16f commit 5d430c9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+78
-89
lines changed

‎.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,12 @@ _testmain.go
2424
*.prof
2525

2626
coverage.out
27-
gitea
2827

2928
*.db
3029
*.log
3130

31+
/gitea
32+
3233
/bin
3334
/dist
3435
/custom

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
2. Due to testing purpose, data of [try.gogs.io](https://try.gogs.io) was reset in **Jan 28, 2015** and will reset multiple times after. Please do **NOT** put your important data on the site.
2424
3. The demo site [try.gogs.io](https://try.gogs.io) is running under `develop` branch.
2525
4. If you think there are vulnerabilities in the project, please talk privately to **[email protected]**. Thanks!
26-
5. If you're interested in using APIs, we have experimental support with [documentation](https://github.com/gogits/go-gogs-client/wiki).
26+
5. If you're interested in using APIs, we have experimental support with [documentation](https://godoc.org/github.com/go-gitea/go-sdk).
2727
6. If your team/company is using Gogs and would like to put your logo on [our website](https://gogs.io), contact us by any means.
2828

2929
## Purpose

‎cmd/web.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ import (
3939
"github.com/go-macaron/toolbox"
4040
"github.com/go-xorm/xorm"
4141
"github.com/go-gitea/git"
42-
gogs "github.com/gogits/go-gogs-client"
4342
version "github.com/mcuadros/go-version"
4443
"github.com/urfave/cli"
4544
ini "gopkg.in/ini.v1"
@@ -94,7 +93,6 @@ func checkVersion() {
9493
{"gopkg.in/ini.v1", ini.Version, "1.8.4"},
9594
{"gopkg.in/macaron.v1", macaron.Version, "1.1.7"},
9695
{"github.com/go-gitea/git", git.Version, "0.4.1"},
97-
{"github.com/gogits/go-gogs-client", gogs.Version, "0.12.1"},
9896
}
9997
for _, c := range checkers {
10098
if !version.Compare(c.Version(), c.Expected, ">=") {

‎models/action.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"github.com/go-xorm/xorm"
1818

1919
"github.com/go-gitea/git"
20-
api "github.com/gogits/go-gogs-client"
20+
api "github.com/go-gitea/go-sdk/gitea"
2121

2222
"github.com/go-gitea/gitea/modules/base"
2323
"github.com/go-gitea/gitea/modules/log"

‎models/issue.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616

1717
"github.com/Unknwon/com"
1818
"github.com/go-xorm/xorm"
19-
api "github.com/gogits/go-gogs-client"
19+
api "github.com/go-gitea/go-sdk/gitea"
2020
gouuid "github.com/satori/go.uuid"
2121

2222
"github.com/go-gitea/gitea/modules/base"

‎models/issue_comment.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/Unknwon/com"
1313
"github.com/go-xorm/xorm"
1414

15-
api "github.com/gogits/go-gogs-client"
15+
api "github.com/go-gitea/go-sdk/gitea"
1616

1717
"github.com/go-gitea/gitea/modules/log"
1818
"github.com/go-gitea/gitea/modules/markdown"

‎models/issue_label.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313

1414
"github.com/go-xorm/xorm"
1515

16-
api "github.com/gogits/go-gogs-client"
16+
api "github.com/go-gitea/go-sdk/gitea"
1717

1818
"github.com/go-gitea/gitea/modules/base"
1919
)

‎models/pull.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"github.com/go-gitea/gitea/modules/sync"
1919
"github.com/go-xorm/xorm"
2020
"github.com/go-gitea/git"
21-
api "github.com/gogits/go-gogs-client"
21+
api "github.com/go-gitea/go-sdk/gitea"
2222
)
2323

2424
var PullRequestQueue = sync.NewUniqueQueue(setting.Repository.PullRequestQueueLength)

‎models/repo.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"github.com/go-gitea/gitea/modules/sync"
3030
"github.com/go-xorm/xorm"
3131
"github.com/go-gitea/git"
32-
api "github.com/gogits/go-gogs-client"
32+
api "github.com/go-gitea/go-sdk/gitea"
3333
version "github.com/mcuadros/go-version"
3434
ini "gopkg.in/ini.v1"
3535
)

‎models/user.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"github.com/nfnt/resize"
2626

2727
"github.com/go-gitea/git"
28-
api "github.com/gogits/go-gogs-client"
28+
api "github.com/go-gitea/go-sdk/gitea"
2929

3030
"github.com/go-gitea/gitea/modules/avatar"
3131
"github.com/go-gitea/gitea/modules/base"

‎models/webhook.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
"github.com/go-xorm/xorm"
1616
gouuid "github.com/satori/go.uuid"
1717

18-
api "github.com/gogits/go-gogs-client"
18+
api "github.com/go-gitea/go-sdk/gitea"
1919

2020
"github.com/go-gitea/gitea/modules/httplib"
2121
"github.com/go-gitea/gitea/modules/log"

‎models/webhook_slack.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"strings"
1212

1313
"github.com/go-gitea/git"
14-
api "github.com/gogits/go-gogs-client"
14+
api "github.com/go-gitea/go-sdk/gitea"
1515

1616
"github.com/go-gitea/gitea/modules/setting"
1717
)

‎modules/base/base.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
package base
66

7-
const DOC_URL = "https://github.com/gogits/go-gogs-client/wiki"
7+
const DocURL = "https://godoc.org/github.com/go-gitea/go-sdk/gitea"
88

99
type (
1010
TplName string

‎modules/context/api.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func (ctx *APIContext) Error(status int, title string, obj interface{}) {
3636

3737
ctx.JSON(status, map[string]string{
3838
"message": message,
39-
"url": base.DOC_URL,
39+
"url": base.DocURL,
4040
})
4141
}
4242

‎routers/api/v1/admin/org.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package admin
66

77
import (
8-
api "github.com/gogits/go-gogs-client"
8+
api "github.com/go-gitea/go-sdk/gitea"
99

1010
"github.com/go-gitea/gitea/models"
1111
"github.com/go-gitea/gitea/modules/context"

‎routers/api/v1/admin/org_team.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package admin
66

77
import (
8-
api "github.com/gogits/go-gogs-client"
8+
api "github.com/go-gitea/go-sdk/gitea"
99

1010
"github.com/go-gitea/gitea/models"
1111
"github.com/go-gitea/gitea/modules/context"

‎routers/api/v1/admin/repo.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package admin
66

77
import (
8-
api "github.com/gogits/go-gogs-client"
8+
api "github.com/go-gitea/go-sdk/gitea"
99

1010
"github.com/go-gitea/gitea/modules/context"
1111
"github.com/go-gitea/gitea/routers/api/v1/repo"

‎routers/api/v1/admin/user.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package admin
66

77
import (
8-
api "github.com/gogits/go-gogs-client"
8+
api "github.com/go-gitea/go-sdk/gitea"
99

1010
"github.com/go-gitea/gitea/models"
1111
"github.com/go-gitea/gitea/modules/context"

‎routers/api/v1/api.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"github.com/go-macaron/binding"
1111
"gopkg.in/macaron.v1"
1212

13-
api "github.com/gogits/go-gogs-client"
13+
api "github.com/go-gitea/go-sdk/gitea"
1414

1515
"github.com/go-gitea/gitea/models"
1616
"github.com/go-gitea/gitea/modules/auth"

‎routers/api/v1/convert/convert.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"github.com/Unknwon/com"
1111

1212
"github.com/go-gitea/git"
13-
api "github.com/gogits/go-gogs-client"
13+
api "github.com/go-gitea/go-sdk/gitea"
1414

1515
"github.com/go-gitea/gitea/models"
1616
)

‎routers/api/v1/misc/markdown.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package misc
66

77
import (
8-
api "github.com/gogits/go-gogs-client"
8+
api "github.com/go-gitea/go-sdk/gitea"
99

1010
"github.com/go-gitea/gitea/modules/context"
1111
"github.com/go-gitea/gitea/modules/markdown"

‎routers/api/v1/org/org.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package org
66

77
import (
8-
api "github.com/gogits/go-gogs-client"
8+
api "github.com/go-gitea/go-sdk/gitea"
99

1010
"github.com/go-gitea/gitea/models"
1111
"github.com/go-gitea/gitea/modules/context"

‎routers/api/v1/org/team.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package org
66

77
import (
8-
api "github.com/gogits/go-gogs-client"
8+
api "github.com/go-gitea/go-sdk/gitea"
99

1010
"github.com/go-gitea/gitea/modules/context"
1111
"github.com/go-gitea/gitea/routers/api/v1/convert"

‎routers/api/v1/repo/branch.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package repo
66

77
import (
8-
api "github.com/gogits/go-gogs-client"
8+
api "github.com/go-gitea/go-sdk/gitea"
99

1010
"github.com/go-gitea/gitea/modules/context"
1111
"github.com/go-gitea/gitea/routers/api/v1/convert"

‎routers/api/v1/repo/collaborators.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package repo
66

77
import (
8-
api "github.com/gogits/go-gogs-client"
8+
api "github.com/go-gitea/go-sdk/gitea"
99

1010
"github.com/go-gitea/gitea/models"
1111
"github.com/go-gitea/gitea/modules/context"

‎routers/api/v1/repo/hook.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
"github.com/Unknwon/com"
1111

12-
api "github.com/gogits/go-gogs-client"
12+
api "github.com/go-gitea/go-sdk/gitea"
1313

1414
"github.com/go-gitea/gitea/models"
1515
"github.com/go-gitea/gitea/modules/context"

‎routers/api/v1/repo/issue.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"fmt"
99
"strings"
1010

11-
api "github.com/gogits/go-gogs-client"
11+
api "github.com/go-gitea/go-sdk/gitea"
1212

1313
"github.com/go-gitea/gitea/models"
1414
"github.com/go-gitea/gitea/modules/context"

‎routers/api/v1/repo/issue_comment.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package repo
66
import (
77
"time"
88

9-
api "github.com/gogits/go-gogs-client"
9+
api "github.com/go-gitea/go-sdk/gitea"
1010

1111
"github.com/go-gitea/gitea/models"
1212
"github.com/go-gitea/gitea/modules/context"

‎routers/api/v1/repo/issue_label.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package repo
66

77
import (
8-
api "github.com/gogits/go-gogs-client"
8+
api "github.com/go-gitea/go-sdk/gitea"
99

1010
"github.com/go-gitea/gitea/models"
1111
"github.com/go-gitea/gitea/modules/context"

‎routers/api/v1/repo/key.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package repo
77
import (
88
"fmt"
99

10-
api "github.com/gogits/go-gogs-client"
10+
api "github.com/go-gitea/go-sdk/gitea"
1111

1212
"github.com/go-gitea/gitea/models"
1313
"github.com/go-gitea/gitea/modules/context"

‎routers/api/v1/repo/label.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package repo
66

77
import (
8-
api "github.com/gogits/go-gogs-client"
8+
api "github.com/go-gitea/go-sdk/gitea"
99

1010
"github.com/go-gitea/gitea/models"
1111
"github.com/go-gitea/gitea/modules/context"

‎routers/api/v1/repo/milestone.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package repo
77
import (
88
"time"
99

10-
api "github.com/gogits/go-gogs-client"
10+
api "github.com/go-gitea/go-sdk/gitea"
1111

1212
"github.com/go-gitea/gitea/models"
1313
"github.com/go-gitea/gitea/modules/context"

‎routers/api/v1/repo/repo.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package repo
77
import (
88
"path"
99

10-
api "github.com/gogits/go-gogs-client"
10+
api "github.com/go-gitea/go-sdk/gitea"
1111

1212
"github.com/go-gitea/gitea/models"
1313
"github.com/go-gitea/gitea/modules/auth"

‎routers/api/v1/user/app.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package user
66

77
import (
8-
api "github.com/gogits/go-gogs-client"
8+
api "github.com/go-gitea/go-sdk/gitea"
99

1010
"github.com/go-gitea/gitea/models"
1111
"github.com/go-gitea/gitea/modules/context"

‎routers/api/v1/user/email.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package user
66

77
import (
8-
api "github.com/gogits/go-gogs-client"
8+
api "github.com/go-gitea/go-sdk/gitea"
99

1010
"github.com/go-gitea/gitea/models"
1111
"github.com/go-gitea/gitea/modules/context"

‎routers/api/v1/user/follower.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package user
66

77
import (
8-
api "github.com/gogits/go-gogs-client"
8+
api "github.com/go-gitea/go-sdk/gitea"
99

1010
"github.com/go-gitea/gitea/models"
1111
"github.com/go-gitea/gitea/modules/context"

‎routers/api/v1/user/key.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
package user
66

77
import (
8-
api "github.com/gogits/go-gogs-client"
8+
api "github.com/go-gitea/go-sdk/gitea"
99

1010
"github.com/go-gitea/gitea/models"
1111
"github.com/go-gitea/gitea/modules/context"

‎routers/api/v1/user/user.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package user
77
import (
88
"github.com/Unknwon/com"
99

10-
api "github.com/gogits/go-gogs-client"
10+
api "github.com/go-gitea/go-sdk/gitea"
1111

1212
"github.com/go-gitea/gitea/models"
1313
"github.com/go-gitea/gitea/modules/context"

‎routers/repo/webhook.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"github.com/Unknwon/com"
1414

1515
"github.com/go-gitea/git"
16-
api "github.com/gogits/go-gogs-client"
16+
api "github.com/go-gitea/go-sdk/gitea"
1717

1818
"github.com/go-gitea/gitea/models"
1919
"github.com/go-gitea/gitea/modules/auth"
@@ -32,7 +32,7 @@ func Webhooks(ctx *context.Context) {
3232
ctx.Data["Title"] = ctx.Tr("repo.settings.hooks")
3333
ctx.Data["PageIsSettingsHooks"] = true
3434
ctx.Data["BaseLink"] = ctx.Repo.RepoLink
35-
ctx.Data["Description"] = ctx.Tr("repo.settings.hooks_desc", "https://github.com/gogits/go-gogs-client/wiki/Repositories-Webhooks")
35+
ctx.Data["Description"] = ctx.Tr("repo.settings.hooks_desc", "https://godoc.org/github.com/go-gitea/go-sdk/gitea")
3636

3737
ws, err := models.GetWebhooksByRepoID(ctx.Repo.Repository.ID)
3838
if err != nil {

‎templates/repo/create.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
</div>
8484

8585
<div class="inline field">
86-
<label>{{.i18n.Tr "repo.readme"}} <a target="_blank" href="https://github.com/gogits/go-gogs-client/wiki/Repositories#litte-notes-on-readme-template"><span class="octicon octicon-question"></span></a></label>
86+
<label>{{.i18n.Tr "repo.readme"}}</label>
8787
<div class="ui selection dropdown">
8888
<input type="hidden" name="readme" value="{{.readme}}">
8989
<div class="default text">{{.i18n.Tr "repo.readme_helper"}}</div>

0 commit comments

Comments
 (0)