Просмотр исходного кода

Change import reference to match gitea instead of gogs (#37)

tags/v1.0.0
Rémy Boulanouar 7 лет назад
Родитель
Сommit
2d68bd1ef9
100 измененных файлов: 319 добавлений и 319 удалений
  1. 3
    3
      .github/CONTRIBUTING.md
  2. 1
    1
      .github/PULL_REQUEST_TEMPLATE.md
  3. 1
    1
      .gopmfile
  4. 2
    2
      Makefile
  5. 6
    6
      README.md
  6. 3
    3
      README_ZH.md
  7. 2
    2
      cmd/admin.go
  8. 2
    2
      cmd/dump.go
  9. 5
    5
      cmd/serve.go
  10. 3
    3
      cmd/update.go
  11. 14
    14
      cmd/web.go
  12. 1
    1
      conf/app.ini
  13. 2
    2
      docker/build.sh
  14. 1
    1
      glide.yaml
  15. 2
    2
      gogs.go
  16. 1
    1
      models/access.go
  17. 3
    3
      models/action.go
  18. 3
    3
      models/admin.go
  19. 5
    5
      models/git_diff.go
  20. 3
    3
      models/issue.go
  21. 2
    2
      models/issue_comment.go
  22. 1
    1
      models/issue_label.go
  23. 3
    3
      models/issue_mail.go
  24. 3
    3
      models/login_source.go
  25. 5
    5
      models/mail.go
  26. 3
    3
      models/migrations/migrations.go
  27. 2
    2
      models/models.go
  28. 2
    2
      models/org.go
  29. 4
    4
      models/pull.go
  30. 1
    1
      models/release.go
  31. 6
    6
      models/repo.go
  32. 3
    3
      models/repo_editor.go
  33. 4
    4
      models/repo_mirror.go
  34. 2
    2
      models/repo_test.go
  35. 4
    4
      models/ssh_key.go
  36. 1
    1
      models/ssh_key_test.go
  37. 1
    1
      models/token.go
  38. 1
    1
      models/update.go
  39. 5
    5
      models/user.go
  40. 4
    4
      models/webhook.go
  41. 1
    1
      models/webhook_slack.go
  42. 2
    2
      models/wiki.go
  43. 4
    4
      modules/auth/auth.go
  44. 1
    1
      modules/auth/ldap/ldap.go
  45. 1
    1
      modules/auth/repo_form.go
  46. 2
    2
      modules/base/tool.go
  47. 3
    3
      modules/context/api.go
  48. 1
    1
      modules/context/api_org.go
  49. 2
    2
      modules/context/auth.go
  50. 5
    5
      modules/context/context.go
  51. 2
    2
      modules/context/org.go
  52. 3
    3
      modules/context/repo.go
  53. 3
    3
      modules/cron/cron.go
  54. 2
    2
      modules/mailer/mailer.go
  55. 2
    2
      modules/markdown/markdown.go
  56. 2
    2
      modules/markdown/markdown_test.go
  57. 1
    1
      modules/process/manager.go
  58. 3
    3
      modules/setting/setting.go
  59. 3
    3
      modules/ssh/ssh.go
  60. 1
    1
      modules/template/highlight/highlight.go
  61. 5
    5
      modules/template/template.go
  62. 6
    6
      routers/admin/admin.go
  63. 7
    7
      routers/admin/auths.go
  64. 5
    5
      routers/admin/notice.go
  65. 5
    5
      routers/admin/orgs.go
  66. 6
    6
      routers/admin/repos.go
  67. 7
    7
      routers/admin/users.go
  68. 4
    4
      routers/api/v1/admin/org.go
  69. 2
    2
      routers/api/v1/admin/org_repo.go
  70. 4
    4
      routers/api/v1/admin/org_team.go
  71. 3
    3
      routers/api/v1/admin/repo.go
  72. 5
    5
      routers/api/v1/admin/user.go
  73. 8
    8
      routers/api/v1/api.go
  74. 1
    1
      routers/api/v1/convert/convert.go
  75. 1
    1
      routers/api/v1/convert/utils.go
  76. 2
    2
      routers/api/v1/misc/markdown.go
  77. 4
    4
      routers/api/v1/org/org.go
  78. 2
    2
      routers/api/v1/org/team.go
  79. 2
    2
      routers/api/v1/repo/branch.go
  80. 2
    2
      routers/api/v1/repo/collaborators.go
  81. 3
    3
      routers/api/v1/repo/file.go
  82. 3
    3
      routers/api/v1/repo/hook.go
  83. 3
    3
      routers/api/v1/repo/issue.go
  84. 2
    2
      routers/api/v1/repo/issue_comment.go
  85. 2
    2
      routers/api/v1/repo/issue_label.go
  86. 4
    4
      routers/api/v1/repo/key.go
  87. 2
    2
      routers/api/v1/repo/label.go
  88. 2
    2
      routers/api/v1/repo/milestone.go
  89. 6
    6
      routers/api/v1/repo/repo.go
  90. 2
    2
      routers/api/v1/user/app.go
  91. 4
    4
      routers/api/v1/user/email.go
  92. 2
    2
      routers/api/v1/user/follower.go
  93. 5
    5
      routers/api/v1/user/key.go
  94. 2
    2
      routers/api/v1/user/user.go
  95. 4
    4
      routers/dev/template.go
  96. 5
    5
      routers/home.go
  97. 12
    12
      routers/install.go
  98. 5
    5
      routers/org/members.go
  99. 6
    6
      routers/org/org.go
  100. 0
    0
      routers/org/setting.go

+ 3
- 3
.github/CONTRIBUTING.md Просмотреть файл

@@ -15,7 +15,7 @@ Depends on the situation, you will:

### Bug Report

If you find something you consider a bug, please create a issue on [GitHub](https://github.com/gogits/gogs/issues). To avoid wasting time and reduce back-and-forth communication with team members, please include at least the following information in a form comfortable for you:
If you find something you consider a bug, please create a issue on [GitHub](https://github.com/go-gitea/gitea/issues). To avoid wasting time and reduce back-and-forth communication with team members, please include at least the following information in a form comfortable for you:

- Bug Description
- Gogs Version
@@ -24,7 +24,7 @@ If you find something you consider a bug, please create a issue on [GitHub](http
- Error Log
- Other information

Please take a moment to check that an issue on [GitHub](https://github.com/gogits/gogs/issues) doesn't already exist documenting your bug report or improvement proposal. If it does, it never hurts to add a quick "+1" or "I have this problem too". This will help prioritize the most common problems and requests.
Please take a moment to check that an issue on [GitHub](https://github.com/go-gitea/gitea/issues) doesn't already exist documenting your bug report or improvement proposal. If it does, it never hurts to add a quick "+1" or "I have this problem too". This will help prioritize the most common problems and requests.

#### Bug Report Example

@@ -42,7 +42,7 @@ There is no standard form of making a feature request. Just try to describe the

### Pull Request

Please read detailed information on [Wiki](https://github.com/gogits/gogs/wiki/Contributing-Code).
Please read detailed information on [Wiki](https://github.com/go-gitea/gitea/wiki/Contributing-Code).

### Ask For Help


+ 1
- 1
.github/PULL_REQUEST_TEMPLATE.md Просмотреть файл

@@ -2,7 +2,7 @@ The pull request will be closed without any reasons if it does not satisfy any o

1. Please make sure you are targeting the `develop` branch.
2. Please read contributing guidelines:
https://github.com/gogits/gogs/wiki/Contributing-Code
https://github.com/go-gitea/gitea/wiki/Contributing-Code
3. Please describe what your pull request does and which issue you're targeting
4. ... if it is not related to any particular issues, explain why we should not reject your pull request.


+ 1
- 1
.gopmfile Просмотреть файл

@@ -1,5 +1,5 @@
[target]
path = github.com/gogits/gogs
path = github.com/go-gitea/gitea

[deps]
github.com/bradfitz/gomemcache = commit:fb1f79c

+ 2
- 2
Makefile Просмотреть файл

@@ -1,5 +1,5 @@
LDFLAGS += -X "github.com/gogits/gogs/modules/setting.BuildTime=$(shell date -u '+%Y-%m-%d %I:%M:%S %Z')"
LDFLAGS += -X "github.com/gogits/gogs/modules/setting.BuildGitHash=$(shell git rev-parse HEAD)"
LDFLAGS += -X "github.com/go-gitea/gitea/modules/setting.BuildTime=$(shell date -u '+%Y-%m-%d %I:%M:%S %Z')"
LDFLAGS += -X "github.com/go-gitea/gitea/modules/setting.BuildGitHash=$(shell git rev-parse HEAD)"

DATA_FILES := $(shell find conf | sed 's/ /\\ /g')
LESS_FILES := $(wildcard public/less/gogs.less public/less/_*.less)

+ 6
- 6
README.md Просмотреть файл

@@ -1,9 +1,9 @@
Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?branch=master)](https://travis-ci.org/gogits/gogs) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/gogs/localized.svg)](https://crowdin.com/project/gogs) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/gogits/gogs?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
=====================

![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true)
![](https://github.com/go-gitea/gitea/blob/master/public/img/gogs-large-resize.png?raw=true)

##### Current tip version: 0.9.99 (see [Releases](https://github.com/gogits/gogs/releases) for binary versions or submit a task on [alpha stage automated binary building system](https://build.gogs.io/))
##### Current tip version: 0.9.99 (see [Releases](https://github.com/go-gitea/gitea/releases) for binary versions or submit a task on [alpha stage automated binary building system](https://build.gogs.io/))

| Web | UI | Preview |
|:-------------:|:-------:|:-------:|
@@ -13,7 +13,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra

### Important Notes

1. **YOU MUST READ [Contributing Code](https://github.com/gogits/gogs/wiki/Contributing-Code) BEFORE STARTING TO WORK ON A PULL REQUEST**.
1. **YOU MUST READ [Contributing Code](https://github.com/go-gitea/gitea/wiki/Contributing-Code) BEFORE STARTING TO WORK ON A PULL REQUEST**.
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!
@@ -72,7 +72,7 @@ There are 5 ways to install Gogs:
- [Install from binary](https://gogs.io/docs/installation/install_from_binary.html)
- [Install from source](https://gogs.io/docs/installation/install_from_source.html)
- [Install from packages](https://gogs.io/docs/installation/install_from_packages.html)
- [Ship with Docker](https://github.com/gogits/gogs/tree/master/docker)
- [Ship with Docker](https://github.com/go-gitea/gitea/tree/master/docker)
- [Install with Vagrant](https://github.com/geerlingguy/ansible-vagrant-examples/tree/master/gogs)

### Tutorials
@@ -130,9 +130,9 @@ There are 5 ways to install Gogs:
## Contributors

- Ex-team members [@lunny](https://github.com/lunny), [@fuxiaohei](https://github.com/fuxiaohei) and [@slene](https://github.com/slene).
- See [contributors page](https://github.com/gogits/gogs/graphs/contributors) for full list of contributors.
- See [contributors page](https://github.com/go-gitea/gitea/graphs/contributors) for full list of contributors.
- See [TRANSLATORS](conf/locale/TRANSLATORS) for public list of translators.

## 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.
This project is under the MIT License. See the [LICENSE](https://github.com/go-gitea/gitea/blob/master/LICENSE) file for the full license text.

+ 3
- 3
README_ZH.md Просмотреть файл

@@ -53,7 +53,7 @@ Gogs 的目标是打造一个最简单、最快速和最轻松的方式搭建自
- [二进制安装](https://gogs.io/docs/installation/install_from_binary.html)
- [源码安装](https://gogs.io/docs/installation/install_from_source.html)
- [包管理安装](https://gogs.io/docs/installation/install_from_packages.html)
- [采用 Docker 部署](https://github.com/gogits/gogs/tree/master/docker)
- [采用 Docker 部署](https://github.com/go-gitea/gitea/tree/master/docker)
- [通过 Vagrant 安装](https://github.com/geerlingguy/ansible-vagrant-examples/tree/master/gogs)

### 使用教程
@@ -99,9 +99,9 @@ Gogs 的目标是打造一个最简单、最快速和最轻松的方式搭建自
## 贡献成员

- 前团队成员 [@lunny](https://github.com/lunny)、[@fuxiaohei](https://github.com/fuxiaohei) 和 [@slene](https://github.com/slene)。
- 您可以通过查看 [贡献者页面](https://github.com/gogits/gogs/graphs/contributors) 获取完整的贡献者列表。
- 您可以通过查看 [贡献者页面](https://github.com/go-gitea/gitea/graphs/contributors) 获取完整的贡献者列表。
- 您可以通过查看 [TRANSLATORS](conf/locale/TRANSLATORS) 文件获取公开的翻译人员列表。

## 授权许可

本项目采用 MIT 开源授权许可证,完整的授权说明已放置在 [LICENSE](https://github.com/gogits/gogs/blob/master/LICENSE) 文件中。
本项目采用 MIT 开源授权许可证,完整的授权说明已放置在 [LICENSE](https://github.com/go-gitea/gitea/blob/master/LICENSE) 文件中。

+ 2
- 2
cmd/admin.go Просмотреть файл

@@ -9,8 +9,8 @@ import (

"github.com/urfave/cli"

"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/setting"
)

var (

+ 2
- 2
cmd/dump.go Просмотреть файл

@@ -16,8 +16,8 @@ import (
"github.com/Unknwon/cae/zip"
"github.com/urfave/cli"

"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/setting"
)

var CmdDump = cli.Command{

+ 5
- 5
cmd/serve.go Просмотреть файл

@@ -18,11 +18,11 @@ import (
gouuid "github.com/satori/go.uuid"
"github.com/urfave/cli"

"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/httplib"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/base"
"github.com/go-gitea/gitea/modules/httplib"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/setting"
)

const (

+ 3
- 3
cmd/update.go Просмотреть файл

@@ -9,9 +9,9 @@ import (

"github.com/urfave/cli"

"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/setting"
)

var CmdUpdate = cli.Command{

+ 14
- 14
cmd/web.go Просмотреть файл

@@ -32,20 +32,20 @@ import (
"github.com/gogits/git-module"
"github.com/gogits/go-gogs-client"

"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/auth"
"github.com/gogits/gogs/modules/bindata"
"github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/setting"
"github.com/gogits/gogs/modules/template"
"github.com/gogits/gogs/routers"
"github.com/gogits/gogs/routers/admin"
apiv1 "github.com/gogits/gogs/routers/api/v1"
"github.com/gogits/gogs/routers/dev"
"github.com/gogits/gogs/routers/org"
"github.com/gogits/gogs/routers/repo"
"github.com/gogits/gogs/routers/user"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/auth"
"github.com/go-gitea/gitea/modules/bindata"
"github.com/go-gitea/gitea/modules/context"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/setting"
"github.com/go-gitea/gitea/modules/template"
"github.com/go-gitea/gitea/routers"
"github.com/go-gitea/gitea/routers/admin"
apiv1 "github.com/go-gitea/gitea/routers/api/v1"
"github.com/go-gitea/gitea/routers/dev"
"github.com/go-gitea/gitea/routers/org"
"github.com/go-gitea/gitea/routers/repo"
"github.com/go-gitea/gitea/routers/user"
)

var CmdWeb = cli.Command{

+ 1
- 1
conf/app.ini Просмотреть файл

@@ -179,7 +179,7 @@ DISABLE_REGISTRATION = false
REQUIRE_SIGNIN_VIEW = false
; Mail notification
ENABLE_NOTIFY_MAIL = false
; More detail: https://github.com/gogits/gogs/issues/165
; More detail: https://github.com/go-gitea/gitea/issues/165
ENABLE_REVERSE_PROXY_AUTHENTICATION = false
ENABLE_REVERSE_PROXY_AUTO_REGISTRATION = false
; Enable captcha validation for registration

+ 2
- 2
docker/build.sh Просмотреть файл

@@ -20,8 +20,8 @@ go install

# Build Gogs
mkdir -p ${GOPATH}/src/github.com/gogits/
ln -s /app/gogs/ ${GOPATH}/src/github.com/gogits/gogs
cd ${GOPATH}/src/github.com/gogits/gogs
ln -s /app/gogs/ ${GOPATH}/src/github.com/go-gitea/gitea
cd ${GOPATH}/src/github.com/go-gitea/gitea
glide install
make build TAGS="sqlite cert pam"


+ 1
- 1
glide.yaml Просмотреть файл

@@ -1,4 +1,4 @@
package: github.com/gogits/gogs
package: github.com/go-gitea/gitea
import:
- package: github.com/Unknwon/cae
subpackages:

+ 2
- 2
gogs.go Просмотреть файл

@@ -13,8 +13,8 @@ import (

"github.com/urfave/cli"

"github.com/gogits/gogs/cmd"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/cmd"
"github.com/go-gitea/gitea/modules/setting"
)

const APP_VER = "0.9.99.0915"

+ 1
- 1
models/access.go Просмотреть файл

@@ -7,7 +7,7 @@ package models
import (
"fmt"

"github.com/gogits/gogs/modules/log"
"github.com/go-gitea/gitea/modules/log"
)

type AccessMode int

+ 3
- 3
models/action.go Просмотреть файл

@@ -19,9 +19,9 @@ import (
"github.com/gogits/git-module"
api "github.com/gogits/go-gogs-client"

"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/modules/base"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/setting"
)

type ActionType int

+ 3
- 3
models/admin.go Просмотреть файл

@@ -14,9 +14,9 @@ import (
"github.com/Unknwon/com"
"github.com/go-xorm/xorm"

"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/modules/base"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/setting"
)

type NoticeType int

+ 5
- 5
models/git_diff.go Просмотреть файл

@@ -23,11 +23,11 @@ import (

"github.com/gogits/git-module"

"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/process"
"github.com/gogits/gogs/modules/setting"
"github.com/gogits/gogs/modules/template/highlight"
"github.com/go-gitea/gitea/modules/base"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/process"
"github.com/go-gitea/gitea/modules/setting"
"github.com/go-gitea/gitea/modules/template/highlight"
)

type DiffLineType uint8

+ 3
- 3
models/issue.go Просмотреть файл

@@ -19,9 +19,9 @@ import (
api "github.com/gogits/go-gogs-client"
gouuid "github.com/satori/go.uuid"

"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/modules/base"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/setting"
)

var (

+ 2
- 2
models/issue_comment.go Просмотреть файл

@@ -14,8 +14,8 @@ import (

api "github.com/gogits/go-gogs-client"

"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/markdown"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/markdown"
)

// CommentType defines whether a comment is just a simple comment, an action (like close) or a reference.

+ 1
- 1
models/issue_label.go Просмотреть файл

@@ -15,7 +15,7 @@ import (

api "github.com/gogits/go-gogs-client"

"github.com/gogits/gogs/modules/base"
"github.com/go-gitea/gitea/modules/base"
)

var labelColorPattern = regexp.MustCompile("#([a-fA-F0-9]{6})")

+ 3
- 3
models/issue_mail.go Просмотреть файл

@@ -9,9 +9,9 @@ import (

"github.com/Unknwon/com"

"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/markdown"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/markdown"
"github.com/go-gitea/gitea/modules/setting"
)

func (issue *Issue) MailSubject() string {

+ 3
- 3
models/login_source.go Просмотреть файл

@@ -19,9 +19,9 @@ import (
"github.com/go-xorm/core"
"github.com/go-xorm/xorm"

"github.com/gogits/gogs/modules/auth/ldap"
"github.com/gogits/gogs/modules/auth/pam"
"github.com/gogits/gogs/modules/log"
"github.com/go-gitea/gitea/modules/auth/ldap"
"github.com/go-gitea/gitea/modules/auth/pam"
"github.com/go-gitea/gitea/modules/log"
)

type LoginType int

+ 5
- 5
models/mail.go Просмотреть файл

@@ -12,11 +12,11 @@ import (
"gopkg.in/gomail.v2"
"gopkg.in/macaron.v1"

"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/mailer"
"github.com/gogits/gogs/modules/markdown"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/modules/base"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/mailer"
"github.com/go-gitea/gitea/modules/markdown"
"github.com/go-gitea/gitea/modules/setting"
)

const (

+ 3
- 3
models/migrations/migrations.go Просмотреть файл

@@ -20,9 +20,9 @@ import (
gouuid "github.com/satori/go.uuid"
"gopkg.in/ini.v1"

"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/modules/base"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/setting"
)

const _MIN_DB_VER = 4

+ 2
- 2
models/models.go Просмотреть файл

@@ -18,8 +18,8 @@ import (
"github.com/go-xorm/xorm"
_ "github.com/lib/pq"

"github.com/gogits/gogs/models/migrations"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/models/migrations"
"github.com/go-gitea/gitea/modules/setting"
)

// Engine represents a xorm engine or session.

+ 2
- 2
models/org.go Просмотреть файл

@@ -12,8 +12,8 @@ import (

"github.com/go-xorm/xorm"

"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/log"
"github.com/go-gitea/gitea/modules/base"
"github.com/go-gitea/gitea/modules/log"
)

var (

+ 4
- 4
models/pull.go Просмотреть файл

@@ -17,10 +17,10 @@ import (
"github.com/gogits/git-module"
api "github.com/gogits/go-gogs-client"

"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/process"
"github.com/gogits/gogs/modules/setting"
"github.com/gogits/gogs/modules/sync"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/process"
"github.com/go-gitea/gitea/modules/setting"
"github.com/go-gitea/gitea/modules/sync"
)

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

+ 1
- 1
models/release.go Просмотреть файл

@@ -14,7 +14,7 @@ import (

"github.com/gogits/git-module"

"github.com/gogits/gogs/modules/process"
"github.com/go-gitea/gitea/modules/process"
)

// Release represents a release of repository.

+ 6
- 6
models/repo.go Просмотреть файл

@@ -28,12 +28,12 @@ import (
git "github.com/gogits/git-module"
api "github.com/gogits/go-gogs-client"

"github.com/gogits/gogs/modules/bindata"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/markdown"
"github.com/gogits/gogs/modules/process"
"github.com/gogits/gogs/modules/setting"
"github.com/gogits/gogs/modules/sync"
"github.com/go-gitea/gitea/modules/bindata"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/markdown"
"github.com/go-gitea/gitea/modules/process"
"github.com/go-gitea/gitea/modules/setting"
"github.com/go-gitea/gitea/modules/sync"
)

const (

+ 3
- 3
models/repo_editor.go Просмотреть файл

@@ -20,9 +20,9 @@ import (

git "github.com/gogits/git-module"

"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/process"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/process"
"github.com/go-gitea/gitea/modules/setting"
)

// ___________ .___.__ __ ___________.__.__

+ 4
- 4
models/repo_mirror.go Просмотреть файл

@@ -13,10 +13,10 @@ import (
"github.com/go-xorm/xorm"
"gopkg.in/ini.v1"

"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/process"
"github.com/gogits/gogs/modules/setting"
"github.com/gogits/gogs/modules/sync"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/process"
"github.com/go-gitea/gitea/modules/setting"
"github.com/go-gitea/gitea/modules/sync"
)

var MirrorQueue = sync.NewUniqueQueue(setting.Repository.MirrorQueueLength)

+ 2
- 2
models/repo_test.go Просмотреть файл

@@ -1,11 +1,11 @@
package models_test

import (
. "github.com/gogits/gogs/models"
. "github.com/go-gitea/gitea/models"
. "github.com/smartystreets/goconvey/convey"
"testing"

"github.com/gogits/gogs/modules/markdown"
"github.com/go-gitea/gitea/modules/markdown"
)

func TestRepo(t *testing.T) {

+ 4
- 4
models/ssh_key.go Просмотреть файл

@@ -22,10 +22,10 @@ import (
"github.com/go-xorm/xorm"
"golang.org/x/crypto/ssh"

"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/process"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/modules/base"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/process"
"github.com/go-gitea/gitea/modules/setting"
)

const (

+ 1
- 1
models/ssh_key_test.go Просмотреть файл

@@ -11,7 +11,7 @@ import (

. "github.com/smartystreets/goconvey/convey"

"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/modules/setting"
)

func init() {

+ 1
- 1
models/token.go Просмотреть файл

@@ -10,7 +10,7 @@ import (
"github.com/go-xorm/xorm"
gouuid "github.com/satori/go.uuid"

"github.com/gogits/gogs/modules/base"
"github.com/go-gitea/gitea/modules/base"
)

// AccessToken represents a personal access token.

+ 1
- 1
models/update.go Просмотреть файл

@@ -12,7 +12,7 @@ import (

git "github.com/gogits/git-module"

"github.com/gogits/gogs/modules/log"
"github.com/go-gitea/gitea/modules/log"
)

type UpdateTask struct {

+ 5
- 5
models/user.go Просмотреть файл

@@ -27,11 +27,11 @@ import (
"github.com/gogits/git-module"
api "github.com/gogits/go-gogs-client"

"github.com/gogits/gogs/modules/avatar"
"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/markdown"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/modules/avatar"
"github.com/go-gitea/gitea/modules/base"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/markdown"
"github.com/go-gitea/gitea/modules/setting"
)

type UserType int

+ 4
- 4
models/webhook.go Просмотреть файл

@@ -17,10 +17,10 @@ import (

api "github.com/gogits/go-gogs-client"

"github.com/gogits/gogs/modules/httplib"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/setting"
"github.com/gogits/gogs/modules/sync"
"github.com/go-gitea/gitea/modules/httplib"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/setting"
"github.com/go-gitea/gitea/modules/sync"
)

var HookQueue = sync.NewUniqueQueue(setting.Webhook.QueueLength)

+ 1
- 1
models/webhook_slack.go Просмотреть файл

@@ -13,7 +13,7 @@ import (
"github.com/gogits/git-module"
api "github.com/gogits/go-gogs-client"

"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/modules/setting"
)

type SlackMeta struct {

+ 2
- 2
models/wiki.go Просмотреть файл

@@ -17,8 +17,8 @@ import (

"github.com/gogits/git-module"

"github.com/gogits/gogs/modules/setting"
"github.com/gogits/gogs/modules/sync"
"github.com/go-gitea/gitea/modules/setting"
"github.com/go-gitea/gitea/modules/sync"
)

var wikiWorkingPool = sync.NewExclusivePool()

+ 4
- 4
modules/auth/auth.go Просмотреть файл

@@ -15,10 +15,10 @@ import (
gouuid "github.com/satori/go.uuid"
"gopkg.in/macaron.v1"

"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/base"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/setting"
)

func IsAPIPath(url string) bool {

+ 1
- 1
modules/auth/ldap/ldap.go Просмотреть файл

@@ -13,7 +13,7 @@ import (

"gopkg.in/ldap.v2"

"github.com/gogits/gogs/modules/log"
"github.com/go-gitea/gitea/modules/log"
)

type SecurityProtocol int

+ 1
- 1
modules/auth/repo_form.go Просмотреть файл

@@ -12,7 +12,7 @@ import (
"github.com/go-macaron/binding"
"gopkg.in/macaron.v1"

"github.com/gogits/gogs/models"
"github.com/go-gitea/gitea/models"
)

// _______________________________________ _________.______________________ _______________.___.

+ 2
- 2
modules/base/tool.go Просмотреть файл

@@ -26,8 +26,8 @@ import (

"github.com/gogits/chardet"

"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/setting"
)

// EncodeMD5 encodes string to md5 hex value.

+ 3
- 3
modules/context/api.go Просмотреть файл

@@ -11,9 +11,9 @@ import (
"github.com/Unknwon/paginater"
"gopkg.in/macaron.v1"

"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/modules/base"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/setting"
)

type APIContext struct {

+ 1
- 1
modules/context/api_org.go Просмотреть файл

@@ -5,7 +5,7 @@
package context

import (
"github.com/gogits/gogs/models"
"github.com/go-gitea/gitea/models"
)

type APIOrganization struct {

+ 2
- 2
modules/context/auth.go Просмотреть файл

@@ -10,8 +10,8 @@ import (
"github.com/go-macaron/csrf"
"gopkg.in/macaron.v1"

"github.com/gogits/gogs/modules/auth"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/modules/auth"
"github.com/go-gitea/gitea/modules/setting"
)

type ToggleOptions struct {

+ 5
- 5
modules/context/context.go Просмотреть файл

@@ -18,11 +18,11 @@ import (
"github.com/go-macaron/session"
"gopkg.in/macaron.v1"

"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/auth"
"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/auth"
"github.com/go-gitea/gitea/modules/base"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/setting"
)

// Context represents context of a request.

+ 2
- 2
modules/context/org.go Просмотреть файл

@@ -9,8 +9,8 @@ import (

"gopkg.in/macaron.v1"

"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/setting"
)

type Organization struct {

+ 3
- 3
modules/context/repo.go Просмотреть файл

@@ -16,9 +16,9 @@ import (

"github.com/gogits/git-module"

"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/setting"
)

type PullRequest struct {

+ 3
- 3
modules/cron/cron.go Просмотреть файл

@@ -9,9 +9,9 @@ import (

"github.com/gogits/cron"

"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/setting"
)

var c = cron.New()

+ 2
- 2
modules/mailer/mailer.go Просмотреть файл

@@ -17,8 +17,8 @@ import (
"github.com/jaytaylor/html2text"
"gopkg.in/gomail.v2"

"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/setting"
)

type Message struct {

+ 2
- 2
modules/markdown/markdown.go Просмотреть файл

@@ -18,8 +18,8 @@ import (
"github.com/russross/blackfriday"
"golang.org/x/net/html"

"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/modules/base"
"github.com/go-gitea/gitea/modules/setting"
)

const (

+ 2
- 2
modules/markdown/markdown_test.go Просмотреть файл

@@ -1,12 +1,12 @@
package markdown_test

import (
. "github.com/gogits/gogs/modules/markdown"
. "github.com/go-gitea/gitea/modules/markdown"
. "github.com/smartystreets/goconvey/convey"
"testing"

"bytes"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/modules/setting"
"github.com/russross/blackfriday"
)


+ 1
- 1
modules/process/manager.go Просмотреть файл

@@ -11,7 +11,7 @@ import (
"os/exec"
"time"

"github.com/gogits/gogs/modules/log"
"github.com/go-gitea/gitea/modules/log"
)

var (

+ 3
- 3
modules/setting/setting.go Просмотреть файл

@@ -25,9 +25,9 @@ import (
"strk.kbt.io/projects/go/libravatar"
"gopkg.in/ini.v1"

"github.com/gogits/gogs/modules/bindata"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/user"
"github.com/go-gitea/gitea/modules/bindata"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/user"
)

type Scheme string

+ 3
- 3
modules/ssh/ssh.go Просмотреть файл

@@ -17,9 +17,9 @@ import (
"github.com/Unknwon/com"
"golang.org/x/crypto/ssh"

"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/setting"
)

func cleanCommand(cmd string) string {

+ 1
- 1
modules/template/highlight/highlight.go Просмотреть файл

@@ -8,7 +8,7 @@ import (
"path"
"strings"

"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/modules/setting"
)

var (

+ 5
- 5
modules/template/template.go Просмотреть файл

@@ -19,11 +19,11 @@ import (
"golang.org/x/text/transform"
"gopkg.in/editorconfig/editorconfig-core-go.v1"

"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/markdown"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/base"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/markdown"
"github.com/go-gitea/gitea/modules/setting"
)

func NewFuncMap() []template.FuncMap {

+ 6
- 6
routers/admin/admin.go Просмотреть файл

@@ -13,12 +13,12 @@ import (
"github.com/Unknwon/com"
"gopkg.in/macaron.v1"

"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/modules/cron"
"github.com/gogits/gogs/modules/process"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/base"
"github.com/go-gitea/gitea/modules/context"
"github.com/go-gitea/gitea/modules/cron"
"github.com/go-gitea/gitea/modules/process"
"github.com/go-gitea/gitea/modules/setting"
)

const (

+ 7
- 7
routers/admin/auths.go Просмотреть файл

@@ -10,13 +10,13 @@ import (
"github.com/Unknwon/com"
"github.com/go-xorm/core"

"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/auth"
"github.com/gogits/gogs/modules/auth/ldap"
"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/auth"
"github.com/go-gitea/gitea/modules/auth/ldap"
"github.com/go-gitea/gitea/modules/base"
"github.com/go-gitea/gitea/modules/context"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/setting"
)

const (

+ 5
- 5
routers/admin/notice.go Просмотреть файл

@@ -8,11 +8,11 @@ import (
"github.com/Unknwon/com"
"github.com/Unknwon/paginater"

"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/base"
"github.com/go-gitea/gitea/modules/context"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/setting"
)

const (

+ 5
- 5
routers/admin/orgs.go Просмотреть файл

@@ -5,11 +5,11 @@
package admin

import (
"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/modules/setting"
"github.com/gogits/gogs/routers"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/base"
"github.com/go-gitea/gitea/modules/context"
"github.com/go-gitea/gitea/modules/setting"
"github.com/go-gitea/gitea/routers"
)

const (

+ 6
- 6
routers/admin/repos.go Просмотреть файл

@@ -5,12 +5,12 @@
package admin

import (
"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/setting"
"github.com/gogits/gogs/routers"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/base"
"github.com/go-gitea/gitea/modules/context"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/setting"
"github.com/go-gitea/gitea/routers"
)

const (

+ 7
- 7
routers/admin/users.go Просмотреть файл

@@ -9,13 +9,13 @@ import (

"github.com/Unknwon/com"

"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/auth"
"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/setting"
"github.com/gogits/gogs/routers"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/auth"
"github.com/go-gitea/gitea/modules/base"
"github.com/go-gitea/gitea/modules/context"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/setting"
"github.com/go-gitea/gitea/routers"
)

const (

+ 4
- 4
routers/api/v1/admin/org.go Просмотреть файл

@@ -7,10 +7,10 @@ package admin
import (
api "github.com/gogits/go-gogs-client"

"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/routers/api/v1/convert"
"github.com/gogits/gogs/routers/api/v1/user"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/context"
"github.com/go-gitea/gitea/routers/api/v1/convert"
"github.com/go-gitea/gitea/routers/api/v1/user"
)

// https://github.com/gogits/go-gogs-client/wiki/Administration-Organizations#create-a-new-organization

+ 2
- 2
routers/api/v1/admin/org_repo.go Просмотреть файл

@@ -5,8 +5,8 @@
package admin

import (
"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/context"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/context"
)

func GetRepositoryByParams(ctx *context.APIContext) *models.Repository {

+ 4
- 4
routers/api/v1/admin/org_team.go Просмотреть файл

@@ -7,10 +7,10 @@ package admin
import (
api "github.com/gogits/go-gogs-client"

"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/routers/api/v1/convert"
"github.com/gogits/gogs/routers/api/v1/user"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/context"
"github.com/go-gitea/gitea/routers/api/v1/convert"
"github.com/go-gitea/gitea/routers/api/v1/user"
)

func CreateTeam(ctx *context.APIContext, form api.CreateTeamOption) {

+ 3
- 3
routers/api/v1/admin/repo.go Просмотреть файл

@@ -7,9 +7,9 @@ package admin
import (
api "github.com/gogits/go-gogs-client"

"github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/routers/api/v1/repo"
"github.com/gogits/gogs/routers/api/v1/user"
"github.com/go-gitea/gitea/modules/context"
"github.com/go-gitea/gitea/routers/api/v1/repo"
"github.com/go-gitea/gitea/routers/api/v1/user"
)

// https://github.com/gogits/go-gogs-client/wiki/Administration-Repositories#create-a-new-repository

+ 5
- 5
routers/api/v1/admin/user.go Просмотреть файл

@@ -7,11 +7,11 @@ package admin
import (
api "github.com/gogits/go-gogs-client"

"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/setting"
"github.com/gogits/gogs/routers/api/v1/user"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/context"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/setting"
"github.com/go-gitea/gitea/routers/api/v1/user"
)

func parseLoginSource(ctx *context.APIContext, u *models.User, sourceID int64, loginName string) {

+ 8
- 8
routers/api/v1/api.go Просмотреть файл

@@ -12,14 +12,14 @@ import (

api "github.com/gogits/go-gogs-client"

"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/auth"
"github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/routers/api/v1/admin"
"github.com/gogits/gogs/routers/api/v1/misc"
"github.com/gogits/gogs/routers/api/v1/org"
"github.com/gogits/gogs/routers/api/v1/repo"
"github.com/gogits/gogs/routers/api/v1/user"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/auth"
"github.com/go-gitea/gitea/modules/context"
"github.com/go-gitea/gitea/routers/api/v1/admin"
"github.com/go-gitea/gitea/routers/api/v1/misc"
"github.com/go-gitea/gitea/routers/api/v1/org"
"github.com/go-gitea/gitea/routers/api/v1/repo"
"github.com/go-gitea/gitea/routers/api/v1/user"
)

func repoAssignment() macaron.Handler {

+ 1
- 1
routers/api/v1/convert/convert.go Просмотреть файл

@@ -12,7 +12,7 @@ import (
"github.com/gogits/git-module"
api "github.com/gogits/go-gogs-client"

"github.com/gogits/gogs/models"
"github.com/go-gitea/gitea/models"
)

func ToEmail(email *models.EmailAddress) *api.Email {

+ 1
- 1
routers/api/v1/convert/utils.go Просмотреть файл

@@ -5,7 +5,7 @@
package convert

import (
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/modules/setting"
)

// ToCorrectPageSize makes sure page size is in allowed range.

+ 2
- 2
routers/api/v1/misc/markdown.go Просмотреть файл

@@ -7,8 +7,8 @@ package misc
import (
api "github.com/gogits/go-gogs-client"

"github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/modules/markdown"
"github.com/go-gitea/gitea/modules/context"
"github.com/go-gitea/gitea/modules/markdown"
)

// https://github.com/gogits/go-gogs-client/wiki/Miscellaneous#render-an-arbitrary-markdown-document

+ 4
- 4
routers/api/v1/org/org.go Просмотреть файл

@@ -7,10 +7,10 @@ package org
import (
api "github.com/gogits/go-gogs-client"

"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/routers/api/v1/convert"
"github.com/gogits/gogs/routers/api/v1/user"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/context"
"github.com/go-gitea/gitea/routers/api/v1/convert"
"github.com/go-gitea/gitea/routers/api/v1/user"
)

func listUserOrgs(ctx *context.APIContext, u *models.User, all bool) {

+ 2
- 2
routers/api/v1/org/team.go Просмотреть файл

@@ -7,8 +7,8 @@ package org
import (
api "github.com/gogits/go-gogs-client"

"github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/routers/api/v1/convert"
"github.com/go-gitea/gitea/modules/context"
"github.com/go-gitea/gitea/routers/api/v1/convert"
)

func ListTeams(ctx *context.APIContext) {

+ 2
- 2
routers/api/v1/repo/branch.go Просмотреть файл

@@ -7,8 +7,8 @@ package repo
import (
api "github.com/gogits/go-gogs-client"

"github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/routers/api/v1/convert"
"github.com/go-gitea/gitea/modules/context"
"github.com/go-gitea/gitea/routers/api/v1/convert"
)

// https://github.com/gogits/go-gogs-client/wiki/Repositories#get-branch

+ 2
- 2
routers/api/v1/repo/collaborators.go Просмотреть файл

@@ -7,8 +7,8 @@ package repo
import (
api "github.com/gogits/go-gogs-client"

"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/context"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/context"
)

func AddCollaborator(ctx *context.APIContext, form api.AddCollaboratorOption) {

+ 3
- 3
routers/api/v1/repo/file.go Просмотреть файл

@@ -7,9 +7,9 @@ package repo
import (
"github.com/gogits/git-module"

"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/routers/repo"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/context"
"github.com/go-gitea/gitea/routers/repo"
)

// https://github.com/gogits/go-gogs-client/wiki/Repositories-Contents#download-raw-content

+ 3
- 3
routers/api/v1/repo/hook.go Просмотреть файл

@@ -11,9 +11,9 @@ import (

api "github.com/gogits/go-gogs-client"

"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/routers/api/v1/convert"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/context"
"github.com/go-gitea/gitea/routers/api/v1/convert"
)

// https://github.com/gogits/go-gogs-client/wiki/Repositories#list-hooks

+ 3
- 3
routers/api/v1/repo/issue.go Просмотреть файл

@@ -10,9 +10,9 @@ import (

api "github.com/gogits/go-gogs-client"

"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/context"
"github.com/go-gitea/gitea/modules/setting"
)

func ListIssues(ctx *context.APIContext) {

+ 2
- 2
routers/api/v1/repo/issue_comment.go Просмотреть файл

@@ -8,8 +8,8 @@ import (

api "github.com/gogits/go-gogs-client"

"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/context"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/context"
)

func ListIssueComments(ctx *context.APIContext) {

+ 2
- 2
routers/api/v1/repo/issue_label.go Просмотреть файл

@@ -7,8 +7,8 @@ package repo
import (
api "github.com/gogits/go-gogs-client"

"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/context"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/context"
)

func ListIssueLabels(ctx *context.APIContext) {

+ 4
- 4
routers/api/v1/repo/key.go Просмотреть файл

@@ -9,10 +9,10 @@ import (

api "github.com/gogits/go-gogs-client"

"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/modules/setting"
"github.com/gogits/gogs/routers/api/v1/convert"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/context"
"github.com/go-gitea/gitea/modules/setting"
"github.com/go-gitea/gitea/routers/api/v1/convert"
)

func composeDeployKeysAPILink(repoPath string) string {

+ 2
- 2
routers/api/v1/repo/label.go Просмотреть файл

@@ -7,8 +7,8 @@ package repo
import (
api "github.com/gogits/go-gogs-client"

"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/context"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/context"
)

func ListLabels(ctx *context.APIContext) {

+ 2
- 2
routers/api/v1/repo/milestone.go Просмотреть файл

@@ -9,8 +9,8 @@ import (

api "github.com/gogits/go-gogs-client"

"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/context"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/context"
)

func ListMilestones(ctx *context.APIContext) {

+ 6
- 6
routers/api/v1/repo/repo.go Просмотреть файл

@@ -9,12 +9,12 @@ import (

api "github.com/gogits/go-gogs-client"

"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/auth"
"github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/setting"
"github.com/gogits/gogs/routers/api/v1/convert"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/auth"
"github.com/go-gitea/gitea/modules/context"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/setting"
"github.com/go-gitea/gitea/routers/api/v1/convert"
)

// https://github.com/gogits/go-gogs-client/wiki/Repositories#search-repositories

+ 2
- 2
routers/api/v1/user/app.go Просмотреть файл

@@ -7,8 +7,8 @@ package user
import (
api "github.com/gogits/go-gogs-client"

"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/context"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/context"
)

// https://github.com/gogits/go-gogs-client/wiki/Users#list-access-tokens-for-a-user

+ 4
- 4
routers/api/v1/user/email.go Просмотреть файл

@@ -7,10 +7,10 @@ package user
import (
api "github.com/gogits/go-gogs-client"

"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/modules/setting"
"github.com/gogits/gogs/routers/api/v1/convert"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/context"
"github.com/go-gitea/gitea/modules/setting"
"github.com/go-gitea/gitea/routers/api/v1/convert"
)

// https://github.com/gogits/go-gogs-client/wiki/Users-Emails#list-email-addresses-for-a-user

+ 2
- 2
routers/api/v1/user/follower.go Просмотреть файл

@@ -7,8 +7,8 @@ package user
import (
api "github.com/gogits/go-gogs-client"

"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/context"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/context"
)

func responseApiUsers(ctx *context.APIContext, users []*models.User) {

+ 5
- 5
routers/api/v1/user/key.go Просмотреть файл

@@ -7,11 +7,11 @@ package user
import (
api "github.com/gogits/go-gogs-client"

"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/modules/setting"
"github.com/gogits/gogs/routers/api/v1/convert"
"github.com/gogits/gogs/routers/api/v1/repo"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/context"
"github.com/go-gitea/gitea/modules/setting"
"github.com/go-gitea/gitea/routers/api/v1/convert"
"github.com/go-gitea/gitea/routers/api/v1/repo"
)

func GetUserByParamsName(ctx *context.APIContext, name string) *models.User {

+ 2
- 2
routers/api/v1/user/user.go Просмотреть файл

@@ -9,8 +9,8 @@ import (

api "github.com/gogits/go-gogs-client"

"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/context"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/context"
)

func Search(ctx *context.APIContext) {

+ 4
- 4
routers/dev/template.go Просмотреть файл

@@ -5,10 +5,10 @@
package dev

import (
"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/base"
"github.com/go-gitea/gitea/modules/context"
"github.com/go-gitea/gitea/modules/setting"
)

func TemplatePreview(ctx *context.Context) {

+ 5
- 5
routers/home.go Просмотреть файл

@@ -9,11 +9,11 @@ import (

"github.com/Unknwon/paginater"

"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/modules/setting"
"github.com/gogits/gogs/routers/user"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/base"
"github.com/go-gitea/gitea/modules/context"
"github.com/go-gitea/gitea/modules/setting"
"github.com/go-gitea/gitea/routers/user"
)

const (

+ 12
- 12
routers/install.go Просмотреть файл

@@ -19,18 +19,18 @@ import (

"github.com/gogits/git-module"

"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/auth"
"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/modules/cron"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/mailer"
"github.com/gogits/gogs/modules/markdown"
"github.com/gogits/gogs/modules/setting"
"github.com/gogits/gogs/modules/ssh"
"github.com/gogits/gogs/modules/template/highlight"
"github.com/gogits/gogs/modules/user"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/auth"
"github.com/go-gitea/gitea/modules/base"
"github.com/go-gitea/gitea/modules/context"
"github.com/go-gitea/gitea/modules/cron"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/mailer"
"github.com/go-gitea/gitea/modules/markdown"
"github.com/go-gitea/gitea/modules/setting"
"github.com/go-gitea/gitea/modules/ssh"
"github.com/go-gitea/gitea/modules/template/highlight"
"github.com/go-gitea/gitea/modules/user"
)

const (

+ 5
- 5
routers/org/members.go Просмотреть файл

@@ -7,11 +7,11 @@ package org
import (
"github.com/Unknwon/com"

"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/base"
"github.com/go-gitea/gitea/modules/context"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/setting"
)

const (

+ 6
- 6
routers/org/org.go Просмотреть файл

@@ -5,12 +5,12 @@
package org

import (
"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/auth"
"github.com/gogits/gogs/modules/base"
"github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/models"
"github.com/go-gitea/gitea/modules/auth"
"github.com/go-gitea/gitea/modules/base"
"github.com/go-gitea/gitea/modules/context"
"github.com/go-gitea/gitea/modules/log"
"github.com/go-gitea/gitea/modules/setting"
)

const (

+ 0
- 0
routers/org/setting.go Просмотреть файл


Некоторые файлы не были показаны из-за большого количества измененных файлов

Загрузка…
Отмена
Сохранить