Merge pull request #108 from go-gitea/go-sdk

Replaced gogits go-gogs-client with go-sdk
This commit is contained in:
Thomas Boerger 2016-11-07 16:31:17 +01:00 committed by GitHub
commit 5d430c9e68
68 changed files with 78 additions and 89 deletions

3
.gitignore vendored
View file

@ -24,11 +24,12 @@ _testmain.go
*.prof
coverage.out
gitea
*.db
*.log
/gitea
/bin
/dist
/custom

View file

@ -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

View file

@ -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, ">=") {

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"
)

View file

@ -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)

View file

@ -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"
)

View file

@ -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"

View file

@ -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"

View file

@ -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"
)

View file

@ -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

View file

@ -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,
})
}

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"
)

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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 {

View file

@ -83,7 +83,7 @@
</div>
<div class="inline field">
<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>
<label>{{.i18n.Tr "repo.readme"}}</label>
<div class="ui selection dropdown">
<input type="hidden" name="readme" value="{{.readme}}">
<div class="default text">{{.i18n.Tr "repo.readme_helper"}}</div>

View file

@ -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.

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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

View file

@ -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"

View file

@ -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"

View file

@ -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"`

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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"

View file

@ -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.

12
vendor/vendor.json vendored
View file

@ -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",