diff --git a/.gitignore b/.gitignore index 6801418ef..a8d0e64c6 100644 --- a/.gitignore +++ b/.gitignore @@ -24,11 +24,12 @@ _testmain.go *.prof coverage.out -gitea *.db *.log +/gitea + /bin /dist /custom diff --git a/README.md b/README.md index f97e30934..e3e8a7177 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ 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. 3. The demo site [try.gogs.io](https://try.gogs.io) is running under `develop` branch. 4. If you think there are vulnerabilities in the project, please talk privately to **u@gogs.io**. Thanks! -5. If you're interested in using APIs, we have experimental support with [documentation](https://github.com/gogits/go-gogs-client/wiki). +5. If you're interested in using APIs, we have experimental support with [documentation](https://godoc.org/github.com/go-gitea/go-sdk). 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. ## Purpose diff --git a/cmd/web.go b/cmd/web.go index 2fb1a7e71..36425b823 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -39,7 +39,6 @@ import ( "github.com/go-macaron/toolbox" "github.com/go-xorm/xorm" "github.com/go-gitea/git" - gogs "github.com/gogits/go-gogs-client" version "github.com/mcuadros/go-version" "github.com/urfave/cli" ini "gopkg.in/ini.v1" @@ -94,7 +93,6 @@ func checkVersion() { {"gopkg.in/ini.v1", ini.Version, "1.8.4"}, {"gopkg.in/macaron.v1", macaron.Version, "1.1.7"}, {"github.com/go-gitea/git", git.Version, "0.4.1"}, - {"github.com/gogits/go-gogs-client", gogs.Version, "0.12.1"}, } for _, c := range checkers { if !version.Compare(c.Version(), c.Expected, ">=") { diff --git a/models/action.go b/models/action.go index 6943802f0..055bc4b29 100644 --- a/models/action.go +++ b/models/action.go @@ -17,7 +17,7 @@ import ( "github.com/go-xorm/xorm" "github.com/go-gitea/git" - api "github.com/gogits/go-gogs-client" + api "github.com/go-gitea/go-sdk/gitea" "github.com/go-gitea/gitea/modules/base" "github.com/go-gitea/gitea/modules/log" diff --git a/models/issue.go b/models/issue.go index be9eedcd2..b63ff48fe 100644 --- a/models/issue.go +++ b/models/issue.go @@ -16,7 +16,7 @@ import ( "github.com/Unknwon/com" "github.com/go-xorm/xorm" - api "github.com/gogits/go-gogs-client" + api "github.com/go-gitea/go-sdk/gitea" gouuid "github.com/satori/go.uuid" "github.com/go-gitea/gitea/modules/base" diff --git a/models/issue_comment.go b/models/issue_comment.go index 1c615ab51..d75b42cd3 100644 --- a/models/issue_comment.go +++ b/models/issue_comment.go @@ -12,7 +12,7 @@ import ( "github.com/Unknwon/com" "github.com/go-xorm/xorm" - api "github.com/gogits/go-gogs-client" + api "github.com/go-gitea/go-sdk/gitea" "github.com/go-gitea/gitea/modules/log" "github.com/go-gitea/gitea/modules/markdown" diff --git a/models/issue_label.go b/models/issue_label.go index 0b9644c24..24d6bcac7 100644 --- a/models/issue_label.go +++ b/models/issue_label.go @@ -13,7 +13,7 @@ import ( "github.com/go-xorm/xorm" - api "github.com/gogits/go-gogs-client" + api "github.com/go-gitea/go-sdk/gitea" "github.com/go-gitea/gitea/modules/base" ) diff --git a/models/pull.go b/models/pull.go index adb5ab74f..600360f76 100644 --- a/models/pull.go +++ b/models/pull.go @@ -18,7 +18,7 @@ import ( "github.com/go-gitea/gitea/modules/sync" "github.com/go-xorm/xorm" "github.com/go-gitea/git" - api "github.com/gogits/go-gogs-client" + api "github.com/go-gitea/go-sdk/gitea" ) var PullRequestQueue = sync.NewUniqueQueue(setting.Repository.PullRequestQueueLength) diff --git a/models/repo.go b/models/repo.go index 6fa023633..6ae7d9a25 100644 --- a/models/repo.go +++ b/models/repo.go @@ -29,7 +29,7 @@ import ( "github.com/go-gitea/gitea/modules/sync" "github.com/go-xorm/xorm" "github.com/go-gitea/git" - api "github.com/gogits/go-gogs-client" + api "github.com/go-gitea/go-sdk/gitea" version "github.com/mcuadros/go-version" ini "gopkg.in/ini.v1" ) diff --git a/models/user.go b/models/user.go index d2e19eb17..ffa2f6440 100644 --- a/models/user.go +++ b/models/user.go @@ -25,7 +25,7 @@ import ( "github.com/nfnt/resize" "github.com/go-gitea/git" - api "github.com/gogits/go-gogs-client" + api "github.com/go-gitea/go-sdk/gitea" "github.com/go-gitea/gitea/modules/avatar" "github.com/go-gitea/gitea/modules/base" diff --git a/models/webhook.go b/models/webhook.go index bb65dc096..3255f7904 100644 --- a/models/webhook.go +++ b/models/webhook.go @@ -15,7 +15,7 @@ import ( "github.com/go-xorm/xorm" gouuid "github.com/satori/go.uuid" - api "github.com/gogits/go-gogs-client" + api "github.com/go-gitea/go-sdk/gitea" "github.com/go-gitea/gitea/modules/httplib" "github.com/go-gitea/gitea/modules/log" diff --git a/models/webhook_slack.go b/models/webhook_slack.go index 2ee401ee1..ddc2008a3 100644 --- a/models/webhook_slack.go +++ b/models/webhook_slack.go @@ -11,7 +11,7 @@ import ( "strings" "github.com/go-gitea/git" - api "github.com/gogits/go-gogs-client" + api "github.com/go-gitea/go-sdk/gitea" "github.com/go-gitea/gitea/modules/setting" ) diff --git a/modules/base/base.go b/modules/base/base.go index 8ba211aa7..5c5632dee 100644 --- a/modules/base/base.go +++ b/modules/base/base.go @@ -4,7 +4,7 @@ package base -const DOC_URL = "https://github.com/gogits/go-gogs-client/wiki" +const DocURL = "https://godoc.org/github.com/go-gitea/go-sdk/gitea" type ( TplName string diff --git a/modules/context/api.go b/modules/context/api.go index dfd9a5781..1ae11f63f 100644 --- a/modules/context/api.go +++ b/modules/context/api.go @@ -36,7 +36,7 @@ func (ctx *APIContext) Error(status int, title string, obj interface{}) { ctx.JSON(status, map[string]string{ "message": message, - "url": base.DOC_URL, + "url": base.DocURL, }) } diff --git a/routers/api/v1/admin/org.go b/routers/api/v1/admin/org.go index 5e594e1e5..1deaa34b4 100644 --- a/routers/api/v1/admin/org.go +++ b/routers/api/v1/admin/org.go @@ -5,7 +5,7 @@ package admin import ( - api "github.com/gogits/go-gogs-client" + api "github.com/go-gitea/go-sdk/gitea" "github.com/go-gitea/gitea/models" "github.com/go-gitea/gitea/modules/context" diff --git a/routers/api/v1/admin/org_team.go b/routers/api/v1/admin/org_team.go index 7a28d9566..2058ea002 100644 --- a/routers/api/v1/admin/org_team.go +++ b/routers/api/v1/admin/org_team.go @@ -5,7 +5,7 @@ package admin import ( - api "github.com/gogits/go-gogs-client" + api "github.com/go-gitea/go-sdk/gitea" "github.com/go-gitea/gitea/models" "github.com/go-gitea/gitea/modules/context" diff --git a/routers/api/v1/admin/repo.go b/routers/api/v1/admin/repo.go index e673447c4..1ddf65c5e 100644 --- a/routers/api/v1/admin/repo.go +++ b/routers/api/v1/admin/repo.go @@ -5,7 +5,7 @@ package admin import ( - api "github.com/gogits/go-gogs-client" + api "github.com/go-gitea/go-sdk/gitea" "github.com/go-gitea/gitea/modules/context" "github.com/go-gitea/gitea/routers/api/v1/repo" diff --git a/routers/api/v1/admin/user.go b/routers/api/v1/admin/user.go index b25c687d2..1234dbf0c 100644 --- a/routers/api/v1/admin/user.go +++ b/routers/api/v1/admin/user.go @@ -5,7 +5,7 @@ package admin import ( - api "github.com/gogits/go-gogs-client" + api "github.com/go-gitea/go-sdk/gitea" "github.com/go-gitea/gitea/models" "github.com/go-gitea/gitea/modules/context" diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index 2d468eae5..2deafa23c 100644 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -10,7 +10,7 @@ import ( "github.com/go-macaron/binding" "gopkg.in/macaron.v1" - api "github.com/gogits/go-gogs-client" + api "github.com/go-gitea/go-sdk/gitea" "github.com/go-gitea/gitea/models" "github.com/go-gitea/gitea/modules/auth" diff --git a/routers/api/v1/convert/convert.go b/routers/api/v1/convert/convert.go index 94a918be4..a43e00077 100644 --- a/routers/api/v1/convert/convert.go +++ b/routers/api/v1/convert/convert.go @@ -10,7 +10,7 @@ import ( "github.com/Unknwon/com" "github.com/go-gitea/git" - api "github.com/gogits/go-gogs-client" + api "github.com/go-gitea/go-sdk/gitea" "github.com/go-gitea/gitea/models" ) diff --git a/routers/api/v1/misc/markdown.go b/routers/api/v1/misc/markdown.go index 8ca5cde95..296f7faba 100644 --- a/routers/api/v1/misc/markdown.go +++ b/routers/api/v1/misc/markdown.go @@ -5,7 +5,7 @@ package misc import ( - api "github.com/gogits/go-gogs-client" + api "github.com/go-gitea/go-sdk/gitea" "github.com/go-gitea/gitea/modules/context" "github.com/go-gitea/gitea/modules/markdown" diff --git a/routers/api/v1/org/org.go b/routers/api/v1/org/org.go index 3f26f5510..98dc74ae7 100644 --- a/routers/api/v1/org/org.go +++ b/routers/api/v1/org/org.go @@ -5,7 +5,7 @@ package org import ( - api "github.com/gogits/go-gogs-client" + api "github.com/go-gitea/go-sdk/gitea" "github.com/go-gitea/gitea/models" "github.com/go-gitea/gitea/modules/context" diff --git a/routers/api/v1/org/team.go b/routers/api/v1/org/team.go index 0c87ce26b..bb3c8f6fc 100644 --- a/routers/api/v1/org/team.go +++ b/routers/api/v1/org/team.go @@ -5,7 +5,7 @@ package org import ( - api "github.com/gogits/go-gogs-client" + api "github.com/go-gitea/go-sdk/gitea" "github.com/go-gitea/gitea/modules/context" "github.com/go-gitea/gitea/routers/api/v1/convert" diff --git a/routers/api/v1/repo/branch.go b/routers/api/v1/repo/branch.go index f4327378d..06f51bc26 100644 --- a/routers/api/v1/repo/branch.go +++ b/routers/api/v1/repo/branch.go @@ -5,7 +5,7 @@ package repo import ( - api "github.com/gogits/go-gogs-client" + api "github.com/go-gitea/go-sdk/gitea" "github.com/go-gitea/gitea/modules/context" "github.com/go-gitea/gitea/routers/api/v1/convert" diff --git a/routers/api/v1/repo/collaborators.go b/routers/api/v1/repo/collaborators.go index cfb211890..13cba4814 100644 --- a/routers/api/v1/repo/collaborators.go +++ b/routers/api/v1/repo/collaborators.go @@ -5,7 +5,7 @@ package repo import ( - api "github.com/gogits/go-gogs-client" + api "github.com/go-gitea/go-sdk/gitea" "github.com/go-gitea/gitea/models" "github.com/go-gitea/gitea/modules/context" diff --git a/routers/api/v1/repo/hook.go b/routers/api/v1/repo/hook.go index 315172199..3d0bb80a7 100644 --- a/routers/api/v1/repo/hook.go +++ b/routers/api/v1/repo/hook.go @@ -9,7 +9,7 @@ import ( "github.com/Unknwon/com" - api "github.com/gogits/go-gogs-client" + api "github.com/go-gitea/go-sdk/gitea" "github.com/go-gitea/gitea/models" "github.com/go-gitea/gitea/modules/context" diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go index 9193c0210..4e5369961 100644 --- a/routers/api/v1/repo/issue.go +++ b/routers/api/v1/repo/issue.go @@ -8,7 +8,7 @@ import ( "fmt" "strings" - api "github.com/gogits/go-gogs-client" + api "github.com/go-gitea/go-sdk/gitea" "github.com/go-gitea/gitea/models" "github.com/go-gitea/gitea/modules/context" diff --git a/routers/api/v1/repo/issue_comment.go b/routers/api/v1/repo/issue_comment.go index 71ce19fe3..28751008d 100644 --- a/routers/api/v1/repo/issue_comment.go +++ b/routers/api/v1/repo/issue_comment.go @@ -6,7 +6,7 @@ package repo import ( "time" - api "github.com/gogits/go-gogs-client" + api "github.com/go-gitea/go-sdk/gitea" "github.com/go-gitea/gitea/models" "github.com/go-gitea/gitea/modules/context" diff --git a/routers/api/v1/repo/issue_label.go b/routers/api/v1/repo/issue_label.go index 0d520a4f9..8f56afd61 100644 --- a/routers/api/v1/repo/issue_label.go +++ b/routers/api/v1/repo/issue_label.go @@ -5,7 +5,7 @@ package repo import ( - api "github.com/gogits/go-gogs-client" + api "github.com/go-gitea/go-sdk/gitea" "github.com/go-gitea/gitea/models" "github.com/go-gitea/gitea/modules/context" diff --git a/routers/api/v1/repo/key.go b/routers/api/v1/repo/key.go index ec60bc516..adac6a6e6 100644 --- a/routers/api/v1/repo/key.go +++ b/routers/api/v1/repo/key.go @@ -7,7 +7,7 @@ package repo import ( "fmt" - api "github.com/gogits/go-gogs-client" + api "github.com/go-gitea/go-sdk/gitea" "github.com/go-gitea/gitea/models" "github.com/go-gitea/gitea/modules/context" diff --git a/routers/api/v1/repo/label.go b/routers/api/v1/repo/label.go index efa68b0a1..1e4f78f59 100644 --- a/routers/api/v1/repo/label.go +++ b/routers/api/v1/repo/label.go @@ -5,7 +5,7 @@ package repo import ( - api "github.com/gogits/go-gogs-client" + api "github.com/go-gitea/go-sdk/gitea" "github.com/go-gitea/gitea/models" "github.com/go-gitea/gitea/modules/context" diff --git a/routers/api/v1/repo/milestone.go b/routers/api/v1/repo/milestone.go index 8913190f6..4e4b40ae9 100644 --- a/routers/api/v1/repo/milestone.go +++ b/routers/api/v1/repo/milestone.go @@ -7,7 +7,7 @@ package repo import ( "time" - api "github.com/gogits/go-gogs-client" + api "github.com/go-gitea/go-sdk/gitea" "github.com/go-gitea/gitea/models" "github.com/go-gitea/gitea/modules/context" diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go index e6890ca33..0b28ee0f9 100644 --- a/routers/api/v1/repo/repo.go +++ b/routers/api/v1/repo/repo.go @@ -7,7 +7,7 @@ package repo import ( "path" - api "github.com/gogits/go-gogs-client" + api "github.com/go-gitea/go-sdk/gitea" "github.com/go-gitea/gitea/models" "github.com/go-gitea/gitea/modules/auth" diff --git a/routers/api/v1/user/app.go b/routers/api/v1/user/app.go index 90b571dbb..0e8081f5f 100644 --- a/routers/api/v1/user/app.go +++ b/routers/api/v1/user/app.go @@ -5,7 +5,7 @@ package user import ( - api "github.com/gogits/go-gogs-client" + api "github.com/go-gitea/go-sdk/gitea" "github.com/go-gitea/gitea/models" "github.com/go-gitea/gitea/modules/context" diff --git a/routers/api/v1/user/email.go b/routers/api/v1/user/email.go index 1643f2b0a..1667ee598 100644 --- a/routers/api/v1/user/email.go +++ b/routers/api/v1/user/email.go @@ -5,7 +5,7 @@ package user import ( - api "github.com/gogits/go-gogs-client" + api "github.com/go-gitea/go-sdk/gitea" "github.com/go-gitea/gitea/models" "github.com/go-gitea/gitea/modules/context" diff --git a/routers/api/v1/user/follower.go b/routers/api/v1/user/follower.go index 0f0e7fcec..661bdcbce 100644 --- a/routers/api/v1/user/follower.go +++ b/routers/api/v1/user/follower.go @@ -5,7 +5,7 @@ package user import ( - api "github.com/gogits/go-gogs-client" + api "github.com/go-gitea/go-sdk/gitea" "github.com/go-gitea/gitea/models" "github.com/go-gitea/gitea/modules/context" diff --git a/routers/api/v1/user/key.go b/routers/api/v1/user/key.go index ba4c1e1ee..316ebb65c 100644 --- a/routers/api/v1/user/key.go +++ b/routers/api/v1/user/key.go @@ -5,7 +5,7 @@ package user import ( - api "github.com/gogits/go-gogs-client" + api "github.com/go-gitea/go-sdk/gitea" "github.com/go-gitea/gitea/models" "github.com/go-gitea/gitea/modules/context" diff --git a/routers/api/v1/user/user.go b/routers/api/v1/user/user.go index 6258662b6..e7322d725 100644 --- a/routers/api/v1/user/user.go +++ b/routers/api/v1/user/user.go @@ -7,7 +7,7 @@ package user import ( "github.com/Unknwon/com" - api "github.com/gogits/go-gogs-client" + api "github.com/go-gitea/go-sdk/gitea" "github.com/go-gitea/gitea/models" "github.com/go-gitea/gitea/modules/context" diff --git a/routers/repo/webhook.go b/routers/repo/webhook.go index 77da3ea48..3cb6d1d27 100644 --- a/routers/repo/webhook.go +++ b/routers/repo/webhook.go @@ -13,7 +13,7 @@ import ( "github.com/Unknwon/com" "github.com/go-gitea/git" - api "github.com/gogits/go-gogs-client" + api "github.com/go-gitea/go-sdk/gitea" "github.com/go-gitea/gitea/models" "github.com/go-gitea/gitea/modules/auth" @@ -32,7 +32,7 @@ func Webhooks(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("repo.settings.hooks") ctx.Data["PageIsSettingsHooks"] = true ctx.Data["BaseLink"] = ctx.Repo.RepoLink - ctx.Data["Description"] = ctx.Tr("repo.settings.hooks_desc", "https://github.com/gogits/go-gogs-client/wiki/Repositories-Webhooks") + ctx.Data["Description"] = ctx.Tr("repo.settings.hooks_desc", "https://godoc.org/github.com/go-gitea/go-sdk/gitea") ws, err := models.GetWebhooksByRepoID(ctx.Repo.Repository.ID) if err != nil { diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl index 337e096e5..7e608b1d3 100644 --- a/templates/repo/create.tmpl +++ b/templates/repo/create.tmpl @@ -83,7 +83,7 @@
- +
{{.i18n.Tr "repo.readme_helper"}}
diff --git a/vendor/github.com/gogits/go-gogs-client/LICENSE b/vendor/github.com/go-gitea/go-sdk/LICENSE similarity index 85% rename from vendor/github.com/gogits/go-gogs-client/LICENSE rename to vendor/github.com/go-gitea/go-sdk/LICENSE index 18b264d60..10aeba46b 100644 --- a/vendor/github.com/gogits/go-gogs-client/LICENSE +++ b/vendor/github.com/go-gitea/go-sdk/LICENSE @@ -1,6 +1,5 @@ -The MIT License (MIT) - -Copyright (c) 2014 Go Git Service +Copyright (c) 2016 The Gitea Authors +Copyright (c) 2014 The Gogs Authors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -9,14 +8,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/vendor/github.com/gogits/go-gogs-client/admin_org.go b/vendor/github.com/go-gitea/go-sdk/gitea/admin_org.go similarity index 97% rename from vendor/github.com/gogits/go-gogs-client/admin_org.go rename to vendor/github.com/go-gitea/go-sdk/gitea/admin_org.go index be140625a..520fa1299 100644 --- a/vendor/github.com/gogits/go-gogs-client/admin_org.go +++ b/vendor/github.com/go-gitea/go-sdk/gitea/admin_org.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package gogs +package gitea import ( "bytes" diff --git a/vendor/github.com/gogits/go-gogs-client/admin_repo.go b/vendor/github.com/go-gitea/go-sdk/gitea/admin_repo.go similarity index 97% rename from vendor/github.com/gogits/go-gogs-client/admin_repo.go rename to vendor/github.com/go-gitea/go-sdk/gitea/admin_repo.go index 50ba2be47..06daa9459 100644 --- a/vendor/github.com/gogits/go-gogs-client/admin_repo.go +++ b/vendor/github.com/go-gitea/go-sdk/gitea/admin_repo.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package gogs +package gitea import ( "bytes" diff --git a/vendor/github.com/gogits/go-gogs-client/admin_user.go b/vendor/github.com/go-gitea/go-sdk/gitea/admin_user.go similarity index 99% rename from vendor/github.com/gogits/go-gogs-client/admin_user.go rename to vendor/github.com/go-gitea/go-sdk/gitea/admin_user.go index 459031d71..186008b77 100644 --- a/vendor/github.com/gogits/go-gogs-client/admin_user.go +++ b/vendor/github.com/go-gitea/go-sdk/gitea/admin_user.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package gogs +package gitea import ( "bytes" diff --git a/vendor/github.com/gogits/go-gogs-client/gogs.go b/vendor/github.com/go-gitea/go-sdk/gitea/gitea.go similarity index 99% rename from vendor/github.com/gogits/go-gogs-client/gogs.go rename to vendor/github.com/go-gitea/go-sdk/gitea/gitea.go index 389439b5f..0a6bf4d74 100644 --- a/vendor/github.com/gogits/go-gogs-client/gogs.go +++ b/vendor/github.com/go-gitea/go-sdk/gitea/gitea.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package gogs +package gitea import ( "encoding/json" diff --git a/vendor/github.com/gogits/go-gogs-client/issue.go b/vendor/github.com/go-gitea/go-sdk/gitea/issue.go similarity index 99% rename from vendor/github.com/gogits/go-gogs-client/issue.go rename to vendor/github.com/go-gitea/go-sdk/gitea/issue.go index 7bb50df61..4392e0000 100644 --- a/vendor/github.com/gogits/go-gogs-client/issue.go +++ b/vendor/github.com/go-gitea/go-sdk/gitea/issue.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package gogs +package gitea import ( "bytes" diff --git a/vendor/github.com/gogits/go-gogs-client/issue_comment.go b/vendor/github.com/go-gitea/go-sdk/gitea/issue_comment.go similarity index 99% rename from vendor/github.com/gogits/go-gogs-client/issue_comment.go rename to vendor/github.com/go-gitea/go-sdk/gitea/issue_comment.go index c766f5594..59f064a8a 100644 --- a/vendor/github.com/gogits/go-gogs-client/issue_comment.go +++ b/vendor/github.com/go-gitea/go-sdk/gitea/issue_comment.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package gogs +package gitea import ( "bytes" diff --git a/vendor/github.com/gogits/go-gogs-client/issue_label.go b/vendor/github.com/go-gitea/go-sdk/gitea/issue_label.go similarity index 99% rename from vendor/github.com/gogits/go-gogs-client/issue_label.go rename to vendor/github.com/go-gitea/go-sdk/gitea/issue_label.go index ce6a64de4..681e504c3 100644 --- a/vendor/github.com/gogits/go-gogs-client/issue_label.go +++ b/vendor/github.com/go-gitea/go-sdk/gitea/issue_label.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package gogs +package gitea import ( "bytes" diff --git a/vendor/github.com/gogits/go-gogs-client/issue_milestone.go b/vendor/github.com/go-gitea/go-sdk/gitea/issue_milestone.go similarity index 99% rename from vendor/github.com/gogits/go-gogs-client/issue_milestone.go rename to vendor/github.com/go-gitea/go-sdk/gitea/issue_milestone.go index ad27a15ef..58f17893a 100644 --- a/vendor/github.com/gogits/go-gogs-client/issue_milestone.go +++ b/vendor/github.com/go-gitea/go-sdk/gitea/issue_milestone.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package gogs +package gitea import ( "bytes" diff --git a/vendor/github.com/gogits/go-gogs-client/miscellaneous.go b/vendor/github.com/go-gitea/go-sdk/gitea/miscellaneous.go similarity index 94% rename from vendor/github.com/gogits/go-gogs-client/miscellaneous.go rename to vendor/github.com/go-gitea/go-sdk/gitea/miscellaneous.go index fcf362ceb..d97940e13 100644 --- a/vendor/github.com/gogits/go-gogs-client/miscellaneous.go +++ b/vendor/github.com/go-gitea/go-sdk/gitea/miscellaneous.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package gogs +package gitea type MarkdownOption struct { Text string diff --git a/vendor/github.com/gogits/go-gogs-client/org.go b/vendor/github.com/go-gitea/go-sdk/gitea/org.go similarity index 99% rename from vendor/github.com/gogits/go-gogs-client/org.go rename to vendor/github.com/go-gitea/go-sdk/gitea/org.go index 08d008822..70d872cf5 100644 --- a/vendor/github.com/gogits/go-gogs-client/org.go +++ b/vendor/github.com/go-gitea/go-sdk/gitea/org.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package gogs +package gitea import ( "bytes" diff --git a/vendor/github.com/gogits/go-gogs-client/org_member.go b/vendor/github.com/go-gitea/go-sdk/gitea/org_member.go similarity index 97% rename from vendor/github.com/gogits/go-gogs-client/org_member.go rename to vendor/github.com/go-gitea/go-sdk/gitea/org_member.go index d9cdadabd..46e839805 100644 --- a/vendor/github.com/gogits/go-gogs-client/org_member.go +++ b/vendor/github.com/go-gitea/go-sdk/gitea/org_member.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package gogs +package gitea import ( "bytes" diff --git a/vendor/github.com/gogits/go-gogs-client/org_team.go b/vendor/github.com/go-gitea/go-sdk/gitea/org_team.go similarity index 97% rename from vendor/github.com/gogits/go-gogs-client/org_team.go rename to vendor/github.com/go-gitea/go-sdk/gitea/org_team.go index 89f09e3f7..38da20d99 100644 --- a/vendor/github.com/gogits/go-gogs-client/org_team.go +++ b/vendor/github.com/go-gitea/go-sdk/gitea/org_team.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package gogs +package gitea type Team struct { ID int64 `json:"id"` diff --git a/vendor/github.com/gogits/go-gogs-client/pull.go b/vendor/github.com/go-gitea/go-sdk/gitea/pull.go similarity index 98% rename from vendor/github.com/gogits/go-gogs-client/pull.go rename to vendor/github.com/go-gitea/go-sdk/gitea/pull.go index be93b269d..efc746388 100644 --- a/vendor/github.com/gogits/go-gogs-client/pull.go +++ b/vendor/github.com/go-gitea/go-sdk/gitea/pull.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package gogs +package gitea import ( "time" diff --git a/vendor/github.com/gogits/go-gogs-client/repo.go b/vendor/github.com/go-gitea/go-sdk/gitea/repo.go similarity index 99% rename from vendor/github.com/gogits/go-gogs-client/repo.go rename to vendor/github.com/go-gitea/go-sdk/gitea/repo.go index f3b393c97..266c01cc9 100644 --- a/vendor/github.com/gogits/go-gogs-client/repo.go +++ b/vendor/github.com/go-gitea/go-sdk/gitea/repo.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package gogs +package gitea import ( "bytes" diff --git a/vendor/github.com/gogits/go-gogs-client/repo_branch.go b/vendor/github.com/go-gitea/go-sdk/gitea/repo_branch.go similarity index 98% rename from vendor/github.com/gogits/go-gogs-client/repo_branch.go rename to vendor/github.com/go-gitea/go-sdk/gitea/repo_branch.go index 1e5811212..c57df07c6 100644 --- a/vendor/github.com/gogits/go-gogs-client/repo_branch.go +++ b/vendor/github.com/go-gitea/go-sdk/gitea/repo_branch.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package gogs +package gitea import ( "fmt" diff --git a/vendor/github.com/gogits/go-gogs-client/repo_collaborator.go b/vendor/github.com/go-gitea/go-sdk/gitea/repo_collaborator.go similarity index 97% rename from vendor/github.com/gogits/go-gogs-client/repo_collaborator.go rename to vendor/github.com/go-gitea/go-sdk/gitea/repo_collaborator.go index 2a0052d0a..1937de4c0 100644 --- a/vendor/github.com/gogits/go-gogs-client/repo_collaborator.go +++ b/vendor/github.com/go-gitea/go-sdk/gitea/repo_collaborator.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package gogs +package gitea import ( "bytes" diff --git a/vendor/github.com/gogits/go-gogs-client/repo_file.go b/vendor/github.com/go-gitea/go-sdk/gitea/repo_file.go similarity index 97% rename from vendor/github.com/gogits/go-gogs-client/repo_file.go rename to vendor/github.com/go-gitea/go-sdk/gitea/repo_file.go index c50708b44..e6c89f0c0 100644 --- a/vendor/github.com/gogits/go-gogs-client/repo_file.go +++ b/vendor/github.com/go-gitea/go-sdk/gitea/repo_file.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package gogs +package gitea import ( "fmt" diff --git a/vendor/github.com/gogits/go-gogs-client/repo_hook.go b/vendor/github.com/go-gitea/go-sdk/gitea/repo_hook.go similarity index 99% rename from vendor/github.com/gogits/go-gogs-client/repo_hook.go rename to vendor/github.com/go-gitea/go-sdk/gitea/repo_hook.go index 7bec411b4..7f71bea1f 100644 --- a/vendor/github.com/gogits/go-gogs-client/repo_hook.go +++ b/vendor/github.com/go-gitea/go-sdk/gitea/repo_hook.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package gogs +package gitea import ( "bytes" diff --git a/vendor/github.com/gogits/go-gogs-client/repo_key.go b/vendor/github.com/go-gitea/go-sdk/gitea/repo_key.go similarity index 99% rename from vendor/github.com/gogits/go-gogs-client/repo_key.go rename to vendor/github.com/go-gitea/go-sdk/gitea/repo_key.go index 2201602c1..acae30aa5 100644 --- a/vendor/github.com/gogits/go-gogs-client/repo_key.go +++ b/vendor/github.com/go-gitea/go-sdk/gitea/repo_key.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package gogs +package gitea import ( "bytes" diff --git a/vendor/github.com/gogits/go-gogs-client/user.go b/vendor/github.com/go-gitea/go-sdk/gitea/user.go similarity index 97% rename from vendor/github.com/gogits/go-gogs-client/user.go rename to vendor/github.com/go-gitea/go-sdk/gitea/user.go index 0bf225470..8b78bea94 100644 --- a/vendor/github.com/gogits/go-gogs-client/user.go +++ b/vendor/github.com/go-gitea/go-sdk/gitea/user.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package gogs +package gitea import ( "fmt" diff --git a/vendor/github.com/gogits/go-gogs-client/user_app.go b/vendor/github.com/go-gitea/go-sdk/gitea/user_app.go similarity index 98% rename from vendor/github.com/gogits/go-gogs-client/user_app.go rename to vendor/github.com/go-gitea/go-sdk/gitea/user_app.go index 965ed6ebf..187053bc9 100644 --- a/vendor/github.com/gogits/go-gogs-client/user_app.go +++ b/vendor/github.com/go-gitea/go-sdk/gitea/user_app.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package gogs +package gitea import ( "bytes" diff --git a/vendor/github.com/gogits/go-gogs-client/user_email.go b/vendor/github.com/go-gitea/go-sdk/gitea/user_email.go similarity index 98% rename from vendor/github.com/gogits/go-gogs-client/user_email.go rename to vendor/github.com/go-gitea/go-sdk/gitea/user_email.go index 02dd40231..e9805ecb6 100644 --- a/vendor/github.com/gogits/go-gogs-client/user_email.go +++ b/vendor/github.com/go-gitea/go-sdk/gitea/user_email.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package gogs +package gitea import ( "bytes" diff --git a/vendor/github.com/gogits/go-gogs-client/user_follow.go b/vendor/github.com/go-gitea/go-sdk/gitea/user_follow.go similarity index 99% rename from vendor/github.com/gogits/go-gogs-client/user_follow.go rename to vendor/github.com/go-gitea/go-sdk/gitea/user_follow.go index 36cc65d45..cbb2c7b3f 100644 --- a/vendor/github.com/gogits/go-gogs-client/user_follow.go +++ b/vendor/github.com/go-gitea/go-sdk/gitea/user_follow.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package gogs +package gitea import "fmt" diff --git a/vendor/github.com/gogits/go-gogs-client/user_key.go b/vendor/github.com/go-gitea/go-sdk/gitea/user_key.go similarity index 99% rename from vendor/github.com/gogits/go-gogs-client/user_key.go rename to vendor/github.com/go-gitea/go-sdk/gitea/user_key.go index c0278e0e9..8af5ed7c4 100644 --- a/vendor/github.com/gogits/go-gogs-client/user_key.go +++ b/vendor/github.com/go-gitea/go-sdk/gitea/user_key.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package gogs +package gitea import ( "bytes" diff --git a/vendor/github.com/gogits/go-gogs-client/utils.go b/vendor/github.com/go-gitea/go-sdk/gitea/utils.go similarity index 96% rename from vendor/github.com/gogits/go-gogs-client/utils.go rename to vendor/github.com/go-gitea/go-sdk/gitea/utils.go index a4d673e0f..8d962ba28 100644 --- a/vendor/github.com/gogits/go-gogs-client/utils.go +++ b/vendor/github.com/go-gitea/go-sdk/gitea/utils.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a MIT-style // license that can be found in the LICENSE file. -package gogs +package gitea import ( "net/http" diff --git a/vendor/github.com/gogits/go-gogs-client/README.md b/vendor/github.com/gogits/go-gogs-client/README.md deleted file mode 100644 index ae33bc06f..000000000 --- a/vendor/github.com/gogits/go-gogs-client/README.md +++ /dev/null @@ -1,8 +0,0 @@ -Gogs API client in Go -===================== - -This package is still in experiment, see [Wiki](https://github.com/gogits/go-gogs-client/wiki) for documentation. - -## License - -This project is under the MIT License. See the [LICENSE](https://github.com/gogits/gogs/blob/master/LICENSE) file for the full license text. \ No newline at end of file diff --git a/vendor/vendor.json b/vendor/vendor.json index c587c0fc8..10fa1c549 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -44,6 +44,12 @@ "revision": "766747ef8b271a2b1142edd0a40735f556ec2c1d", "revisionTime": "2016-11-06T09:52:37Z" }, + { + "checksumSHA1": "/uhZZppDeb3Rbp3h8C0ALR3hdrA=", + "path": "github.com/go-gitea/go-sdk/gitea", + "revision": "0a0a04ccf7a5e6b93d9a5507701635330cf4579c", + "revisionTime": "2016-11-07T15:06:50Z" + }, { "checksumSHA1": "qM/kf31cT2cxjtHxdzbu8q8jPq0=", "path": "github.com/go-macaron/binding", @@ -152,12 +158,6 @@ "revision": "7f3990acf1833faa5ebd0e86f0a4c72a4b5eba3c", "revisionTime": "2016-08-10T03:50:02Z" }, - { - "checksumSHA1": "5P4i69584LOvCooguu2D/pNxU14=", - "path": "github.com/gogits/go-gogs-client", - "revision": "d8aff570fa22d4e38954c753ec8b21862239b31d", - "revisionTime": "2016-08-30T12:34:33Z" - }, { "checksumSHA1": "MLO0PyrK2MUO6A7Z9PxWuu43C/A=", "path": "github.com/issue9/identicon",