closed-social
/
gitea
3
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

Merge branch 'master' into fix/3743-route-regexp-branchname

for-closed-social
Lunny Xiao 8 years ago
committed by GitHub
parent
8ea63f8c50 42a744d9e6
commit
1adde07a3f
129 changed files with 545 additions and 488 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +3
    -3
      .github/CONTRIBUTING.md
  2. +1
    -1
      .github/PULL_REQUEST_TEMPLATE.md
  3. +2
    -2
      .gopmfile
  4. +1
    -0
      .lgtm
  5. +17
    -13
      .travis.yml
  6. +2
    -2
      Makefile
  7. +14
    -8
      README.md
  8. +11
    -5
      README_ZH.md
  9. +2
    -2
      cmd/admin.go
  10. +2
    -2
      cmd/dump.go
  11. +5
    -5
      cmd/serve.go
  12. +3
    -3
      cmd/update.go
  13. +14
    -14
      cmd/web.go
  14. +1
    -1
      conf/app.ini
  15. +2
    -2
      docker/build.sh
  16. +1
    -1
      glide.lock
  17. +2
    -2
      glide.yaml
  18. +2
    -2
      gogs.go
  19. +1
    -1
      models/access.go
  20. +3
    -3
      models/action.go
  21. +3
    -3
      models/admin.go
  22. +5
    -5
      models/git_diff.go
  23. +3
    -3
      models/issue.go
  24. +2
    -2
      models/issue_comment.go
  25. +1
    -1
      models/issue_label.go
  26. +3
    -3
      models/issue_mail.go
  27. +3
    -3
      models/login_source.go
  28. +6
    -6
      models/mail.go
  29. +3
    -3
      models/migrations/migrations.go
  30. +2
    -2
      models/models.go
  31. +2
    -2
      models/org.go
  32. +4
    -4
      models/pull.go
  33. +1
    -1
      models/release.go
  34. +6
    -6
      models/repo.go
  35. +3
    -3
      models/repo_editor.go
  36. +4
    -4
      models/repo_mirror.go
  37. +2
    -2
      models/repo_test.go
  38. +4
    -4
      models/ssh_key.go
  39. +1
    -1
      models/ssh_key_test.go
  40. +1
    -1
      models/token.go
  41. +1
    -1
      models/update.go
  42. +5
    -5
      models/user.go
  43. +4
    -4
      models/webhook.go
  44. +1
    -1
      models/webhook_slack.go
  45. +2
    -2
      models/wiki.go
  46. +4
    -4
      modules/auth/auth.go
  47. +1
    -1
      modules/auth/ldap/ldap.go
  48. +1
    -1
      modules/auth/repo_form.go
  49. +2
    -2
      modules/base/tool.go
  50. +3
    -3
      modules/context/api.go
  51. +1
    -1
      modules/context/api_org.go
  52. +2
    -2
      modules/context/auth.go
  53. +5
    -5
      modules/context/context.go
  54. +2
    -2
      modules/context/org.go
  55. +3
    -3
      modules/context/repo.go
  56. +3
    -3
      modules/cron/cron.go
  57. +2
    -2
      modules/mailer/mailer.go
  58. +2
    -2
      modules/markdown/markdown.go
  59. +2
    -2
      modules/markdown/markdown_test.go
  60. +1
    -1
      modules/process/manager.go
  61. +13
    -4
      modules/setting/setting.go
  62. +3
    -3
      modules/ssh/ssh.go
  63. +1
    -1
      modules/template/highlight/highlight.go
  64. +5
    -5
      modules/template/template.go
  65. +42
    -22
      public/css/gogs.css
  66. +9
    -4
      public/less/_form.less
  67. +6
    -0
      public/less/_organization.less
  68. +6
    -6
      routers/admin/admin.go
  69. +7
    -7
      routers/admin/auths.go
  70. +5
    -5
      routers/admin/notice.go
  71. +5
    -5
      routers/admin/orgs.go
  72. +6
    -6
      routers/admin/repos.go
  73. +7
    -7
      routers/admin/users.go
  74. +4
    -4
      routers/api/v1/admin/org.go
  75. +2
    -2
      routers/api/v1/admin/org_repo.go
  76. +4
    -4
      routers/api/v1/admin/org_team.go
  77. +3
    -3
      routers/api/v1/admin/repo.go
  78. +5
    -5
      routers/api/v1/admin/user.go
  79. +8
    -8
      routers/api/v1/api.go
  80. +1
    -1
      routers/api/v1/convert/convert.go
  81. +1
    -1
      routers/api/v1/convert/utils.go
  82. +2
    -2
      routers/api/v1/misc/markdown.go
  83. +4
    -4
      routers/api/v1/org/org.go
  84. +2
    -2
      routers/api/v1/org/team.go
  85. +2
    -2
      routers/api/v1/repo/branch.go
  86. +2
    -2
      routers/api/v1/repo/collaborators.go
  87. +3
    -3
      routers/api/v1/repo/file.go
  88. +3
    -3
      routers/api/v1/repo/hook.go
  89. +3
    -3
      routers/api/v1/repo/issue.go
  90. +2
    -2
      routers/api/v1/repo/issue_comment.go
  91. +2
    -2
      routers/api/v1/repo/issue_label.go
  92. +4
    -4
      routers/api/v1/repo/key.go
  93. +2
    -2
      routers/api/v1/repo/label.go
  94. +2
    -2
      routers/api/v1/repo/milestone.go
  95. +6
    -6
      routers/api/v1/repo/repo.go
  96. +2
    -2
      routers/api/v1/user/app.go
  97. +4
    -4
      routers/api/v1/user/email.go
  98. +2
    -2
      routers/api/v1/user/follower.go
  99. +5
    -5
      routers/api/v1/user/key.go
  100. +2
    -2
      routers/api/v1/user/user.go

+ 3
- 3
.github/CONTRIBUTING.md View File

@ -15,7 +15,7 @@ Depends on the situation, you will:
### Bug Report ### 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 - Bug Description
- Gogs Version - Gogs Version
@ -24,7 +24,7 @@ If you find something you consider a bug, please create a issue on [GitHub](http
- Error Log - Error Log
- Other information - 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 #### Bug Report Example
@ -42,7 +42,7 @@ There is no standard form of making a feature request. Just try to describe the
### Pull Request ### 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 ### Ask For Help

+ 1
- 1
.github/PULL_REQUEST_TEMPLATE.md View File

@ -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. 1. Please make sure you are targeting the `develop` branch.
2. Please read contributing guidelines: 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 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. 4. ... if it is not related to any particular issues, explain why we should not reject your pull request.

+ 2
- 2
.gopmfile View File

@ -1,5 +1,5 @@
[target] [target]
path = github.com/gogits/gogs
path = github.com/go-gitea/gitea
[deps] [deps]
github.com/bradfitz/gomemcache = commit:fb1f79c github.com/bradfitz/gomemcache = commit:fb1f79c
@ -35,7 +35,7 @@ github.com/nfnt/resize = commit:891127d
github.com/russross/blackfriday = commit:93622da github.com/russross/blackfriday = commit:93622da
github.com/satori/go.uuid = commit:0aa62d5 github.com/satori/go.uuid = commit:0aa62d5
github.com/sergi/go-diff = commit:ec7fdbb github.com/sergi/go-diff = commit:ec7fdbb
github.com/strk/go-libravatar = commit:5eed7bf
strk.kbt.io/projects/go/libravatar = commit:5eed7bf
github.com/shurcooL/sanitized_anchor_name = commit:10ef21a github.com/shurcooL/sanitized_anchor_name = commit:10ef21a
github.com/Unknwon/cae = commit:7f5e046 github.com/Unknwon/cae = commit:7f5e046
github.com/Unknwon/com = commit:28b053d github.com/Unknwon/com = commit:28b053d

+ 1
- 0
.lgtm View File

@ -0,0 +1 @@
self_approval_off = false

+ 17
- 13
.travis.yml View File

@ -1,30 +1,34 @@
language: go language: go
go: go:
- 1.4
- 1.5
- 1.6 - 1.6
- 1.7 - 1.7
before_install: before_install:
- sudo apt-get update -qq - sudo apt-get update -qq
- sudo apt-get install -y libpam-dev - sudo apt-get install -y libpam-dev
- go get github.com/msteinert/pam
- go get github.com/msteinert/pam
install: install:
- go get -t -v ./... - go get -t -v ./...
script:
- go build -v -tags "pam"
- go test -v -cover -race ./...
script: |
go build -v -tags "pam"
for pkg in $(go list ./... | grep -v /vendor/)
do
go test -v -race -cover -coverprofile $GOPATH/src/$pkg/coverage.out $pkg || exit 1
done
after_success:
- bash <(curl -s https://codecov.io/bash)
notifications: notifications:
email:
- u@gogs.io
slack: gophercn:o5pSanyTeNhnfYc3QnG0X7Wx
webhooks: webhooks:
on_success: change
on_failure: always
on_start: never
urls: urls:
- https://webhooks.gitter.im/e/b590f8e03882f7aedc3e
on_success: change
on_failure: always
on_start: never
- https://webhooks.gitter.im/e/ee6b822f3cf54c98e70c
- https://webhooks.gitter.im/e/87428658ef177ce8a7e4
- https://webhooks.gitter.im/e/a1d2b69804dfda72187e

+ 2
- 2
Makefile View File

@ -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') DATA_FILES := $(shell find conf | sed 's/ /\\ /g')
LESS_FILES := $(wildcard public/less/gogs.less public/less/_*.less) LESS_FILES := $(wildcard public/less/gogs.less public/less/_*.less)

+ 14
- 8
README.md View File

@ -1,9 +1,15 @@
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)
=====================
# Gitea - Git with a cup of tea
![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true)
[![Build Status](https://travis-ci.org/go-gitea/gitea.svg?branch=master)](https://travis-ci.org/go-gitea/gitea)
[![codecov](https://codecov.io/gh/go-gitea/gitea/branch/master/graph/badge.svg)](https://codecov.io/gh/go-gitea/gitea)
[![Go Report Card](https://goreportcard.com/badge/github.com/go-gitea/gitea)](https://goreportcard.com/report/github.com/go-gitea/gitea)
[![GoDoc](https://godoc.org/github.com/go-gitea/gitea?status.svg)](https://godoc.org/github.com/go-gitea/gitea)
[![](https://images.microbadger.com/badges/image/gitea/gitea.svg)](http://microbadger.com/images/gitea/gitea "Get your own image badge on microbadger.com")
[![Join the chat at https://gitter.im/go-gitea/gitea](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/go-gitea/gitea?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
##### 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/))
![](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/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 | | Web | UI | Preview |
|:-------------:|:-------:|:-------:| |:-------------:|:-------:|:-------:|
@ -13,7 +19,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra
### Important Notes ### 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. 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. 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! 4. If you think there are vulnerabilities in the project, please talk privately to **u@gogs.io**. Thanks!
@ -72,7 +78,7 @@ There are 5 ways to install Gogs:
- [Install from binary](https://gogs.io/docs/installation/install_from_binary.html) - [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 source](https://gogs.io/docs/installation/install_from_source.html)
- [Install from packages](https://gogs.io/docs/installation/install_from_packages.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) - [Install with Vagrant](https://github.com/geerlingguy/ansible-vagrant-examples/tree/master/gogs)
### Tutorials ### Tutorials
@ -130,9 +136,9 @@ There are 5 ways to install Gogs:
## Contributors ## Contributors
- Ex-team members [@lunny](https://github.com/lunny), [@fuxiaohei](https://github.com/fuxiaohei) and [@slene](https://github.com/slene). - 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. - See [TRANSLATORS](conf/locale/TRANSLATORS) for public list of translators.
## License ## 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.

+ 11
- 5
README_ZH.md View File

@ -1,5 +1,11 @@
Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?branch=master)](https://travis-ci.org/gogits/gogs)
=====================
# Gitea - Git with a cup of tea
[![Build Status](https://travis-ci.org/go-gitea/gitea.svg?branch=master)](https://travis-ci.org/go-gitea/gitea)
[![codecov](https://codecov.io/gh/go-gitea/gitea/branch/master/graph/badge.svg)](https://codecov.io/gh/go-gitea/gitea)
[![Go Report Card](https://goreportcard.com/badge/github.com/go-gitea/gitea)](https://goreportcard.com/report/github.com/go-gitea/gitea)
[![GoDoc](https://godoc.org/github.com/go-gitea/gitea?status.svg)](https://godoc.org/github.com/go-gitea/gitea)
[![](https://images.microbadger.com/badges/image/gitea/gitea.svg)](http://microbadger.com/images/gitea/gitea "Get your own image badge on microbadger.com")
[![Join the chat at https://gitter.im/go-gitea/gitea](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/go-gitea/gitea?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
Gogs (Go Git Service) 是一款极易搭建的自助 Git 服务。 Gogs (Go Git Service) 是一款极易搭建的自助 Git 服务。
@ -53,7 +59,7 @@ Gogs 的目标是打造一个最简单、最快速和最轻松的方式搭建自
- [二进制安装](https://gogs.io/docs/installation/install_from_binary.html) - [二进制安装](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_source.html)
- [包管理安装](https://gogs.io/docs/installation/install_from_packages.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) - [通过 Vagrant 安装](https://github.com/geerlingguy/ansible-vagrant-examples/tree/master/gogs)
### 使用教程 ### 使用教程
@ -99,9 +105,9 @@ Gogs 的目标是打造一个最简单、最快速和最轻松的方式搭建自
## 贡献成员 ## 贡献成员
- 前团队成员 [@lunny](https://github.com/lunny)、[@fuxiaohei](https://github.com/fuxiaohei) 和 [@slene](https://github.com/slene)。 - 前团队成员 [@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) 文件获取公开的翻译人员列表。 - 您可以通过查看 [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 View File

@ -9,8 +9,8 @@ import (
"github.com/urfave/cli" "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 ( var (

+ 2
- 2
cmd/dump.go View File

@ -16,8 +16,8 @@ import (
"github.com/Unknwon/cae/zip" "github.com/Unknwon/cae/zip"
"github.com/urfave/cli" "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{ var CmdDump = cli.Command{

+ 5
- 5
cmd/serve.go View File

@ -18,11 +18,11 @@ import (
gouuid "github.com/satori/go.uuid" gouuid "github.com/satori/go.uuid"
"github.com/urfave/cli" "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 ( const (

+ 3
- 3
cmd/update.go View File

@ -9,9 +9,9 @@ import (
"github.com/urfave/cli" "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{ var CmdUpdate = cli.Command{

+ 14
- 14
cmd/web.go View File

@ -32,20 +32,20 @@ import (
"github.com/gogits/git-module" "github.com/gogits/git-module"
"github.com/gogits/go-gogs-client" "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{ var CmdWeb = cli.Command{

+ 1
- 1
conf/app.ini View File

@ -179,7 +179,7 @@ DISABLE_REGISTRATION = false
REQUIRE_SIGNIN_VIEW = false REQUIRE_SIGNIN_VIEW = false
; Mail notification ; Mail notification
ENABLE_NOTIFY_MAIL = false 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_AUTHENTICATION = false
ENABLE_REVERSE_PROXY_AUTO_REGISTRATION = false ENABLE_REVERSE_PROXY_AUTO_REGISTRATION = false
; Enable captcha validation for registration ; Enable captcha validation for registration

+ 2
- 2
docker/build.sh View File

@ -20,8 +20,8 @@ go install
# Build Gogs # Build Gogs
mkdir -p ${GOPATH}/src/github.com/gogits/ 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 glide install
make build TAGS="sqlite cert pam" make build TAGS="sqlite cert pam"

+ 1
- 1
glide.lock View File

@ -81,7 +81,7 @@ imports:
version: ec7fdbb58eb3e300c8595ad5ac74a5aa50019cc7 version: ec7fdbb58eb3e300c8595ad5ac74a5aa50019cc7
subpackages: subpackages:
- diffmatchpatch - diffmatchpatch
- name: github.com/strk/go-libravatar
- name: strk.kbt.io/projects/go/libravatar
version: 5eed7bff870ae19ef51c5773dbc8f3e9fcbd0982 version: 5eed7bff870ae19ef51c5773dbc8f3e9fcbd0982
- name: github.com/shurcooL/sanitized_anchor_name - name: github.com/shurcooL/sanitized_anchor_name
version: 10ef21a441db47d8b13ebcc5fd2310f636973c77 version: 10ef21a441db47d8b13ebcc5fd2310f636973c77

+ 2
- 2
glide.yaml View File

@ -1,4 +1,4 @@
package: github.com/gogits/gogs
package: github.com/go-gitea/gitea
import: import:
- package: github.com/Unknwon/cae - package: github.com/Unknwon/cae
subpackages: subpackages:
@ -40,7 +40,7 @@ import:
- package: github.com/sergi/go-diff - package: github.com/sergi/go-diff
subpackages: subpackages:
- diffmatchpatch - diffmatchpatch
- package: github.com/strk/go-libravatar
- package: strk.kbt.io/projects/go/libravatar
- package: golang.org/x/crypto - package: golang.org/x/crypto
subpackages: subpackages:
- ssh - ssh

+ 2
- 2
gogs.go View File

@ -13,8 +13,8 @@ import (
"github.com/urfave/cli" "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" const APP_VER = "0.9.99.0915"

+ 1
- 1
models/access.go View File

@ -7,7 +7,7 @@ package models
import ( import (
"fmt" "fmt"
"github.com/gogits/gogs/modules/log"
"github.com/go-gitea/gitea/modules/log"
) )
type AccessMode int type AccessMode int

+ 3
- 3
models/action.go View File

@ -19,9 +19,9 @@ import (
"github.com/gogits/git-module" "github.com/gogits/git-module"
api "github.com/gogits/go-gogs-client" 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 type ActionType int

+ 3
- 3
models/admin.go View File

@ -14,9 +14,9 @@ import (
"github.com/Unknwon/com" "github.com/Unknwon/com"
"github.com/go-xorm/xorm" "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 type NoticeType int

+ 5
- 5
models/git_diff.go View File

@ -23,11 +23,11 @@ import (
"github.com/gogits/git-module" "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 type DiffLineType uint8

+ 3
- 3
models/issue.go View File

@ -19,9 +19,9 @@ import (
api "github.com/gogits/go-gogs-client" api "github.com/gogits/go-gogs-client"
gouuid "github.com/satori/go.uuid" 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 ( var (

+ 2
- 2
models/issue_comment.go View File

@ -14,8 +14,8 @@ import (
api "github.com/gogits/go-gogs-client" 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. // CommentType defines whether a comment is just a simple comment, an action (like close) or a reference.

+ 1
- 1
models/issue_label.go View File

@ -15,7 +15,7 @@ import (
api "github.com/gogits/go-gogs-client" 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})") var labelColorPattern = regexp.MustCompile("#([a-fA-F0-9]{6})")

+ 3
- 3
models/issue_mail.go View File

@ -9,9 +9,9 @@ import (
"github.com/Unknwon/com" "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 { func (issue *Issue) MailSubject() string {

+ 3
- 3
models/login_source.go View File

@ -19,9 +19,9 @@ import (
"github.com/go-xorm/core" "github.com/go-xorm/core"
"github.com/go-xorm/xorm" "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 type LoginType int

+ 6
- 6
models/mail.go View File

@ -12,11 +12,11 @@ import (
"gopkg.in/gomail.v2" "gopkg.in/gomail.v2"
"gopkg.in/macaron.v1" "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 ( const (
@ -160,7 +160,7 @@ func composeIssueMessage(issue *Issue, doer *User, tplName base.TplName, tos []s
if err != nil { if err != nil {
log.Error(3, "HTMLString (%s): %v", tplName, err) log.Error(3, "HTMLString (%s): %v", tplName, err)
} }
msg := mailer.NewMessageFrom(tos, fmt.Sprintf(`"%s" <%s>`, doer.DisplayName(), setting.MailService.User), subject, content)
msg := mailer.NewMessageFrom(tos, fmt.Sprintf(`"%s" <%s>`, doer.DisplayName(), setting.MailService.FromEmail), subject, content)
msg.Info = fmt.Sprintf("Subject: %s, %s", subject, info) msg.Info = fmt.Sprintf("Subject: %s, %s", subject, info)
return msg return msg
} }

+ 3
- 3
models/migrations/migrations.go View File

@ -20,9 +20,9 @@ import (
gouuid "github.com/satori/go.uuid" gouuid "github.com/satori/go.uuid"
"gopkg.in/ini.v1" "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 const _MIN_DB_VER = 4

+ 2
- 2
models/models.go View File

@ -18,8 +18,8 @@ import (
"github.com/go-xorm/xorm" "github.com/go-xorm/xorm"
_ "github.com/lib/pq" _ "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. // Engine represents a xorm engine or session.

+ 2
- 2
models/org.go View File

@ -12,8 +12,8 @@ import (
"github.com/go-xorm/xorm" "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 ( var (

+ 4
- 4
models/pull.go View File

@ -17,10 +17,10 @@ import (
"github.com/gogits/git-module" "github.com/gogits/git-module"
api "github.com/gogits/go-gogs-client" 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) var PullRequestQueue = sync.NewUniqueQueue(setting.Repository.PullRequestQueueLength)

+ 1
- 1
models/release.go View File

@ -14,7 +14,7 @@ import (
"github.com/gogits/git-module" "github.com/gogits/git-module"
"github.com/gogits/gogs/modules/process"
"github.com/go-gitea/gitea/modules/process"
) )
// Release represents a release of repository. // Release represents a release of repository.

+ 6
- 6
models/repo.go View File

@ -28,12 +28,12 @@ import (
git "github.com/gogits/git-module" git "github.com/gogits/git-module"
api "github.com/gogits/go-gogs-client" 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 ( const (

+ 3
- 3
models/repo_editor.go View File

@ -20,9 +20,9 @@ import (
git "github.com/gogits/git-module" 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 View File

@ -13,10 +13,10 @@ import (
"github.com/go-xorm/xorm" "github.com/go-xorm/xorm"
"gopkg.in/ini.v1" "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) var MirrorQueue = sync.NewUniqueQueue(setting.Repository.MirrorQueueLength)

+ 2
- 2
models/repo_test.go View File

@ -1,11 +1,11 @@
package models_test package models_test
import ( import (
. "github.com/gogits/gogs/models"
. "github.com/go-gitea/gitea/models"
. "github.com/smartystreets/goconvey/convey" . "github.com/smartystreets/goconvey/convey"
"testing" "testing"
"github.com/gogits/gogs/modules/markdown"
"github.com/go-gitea/gitea/modules/markdown"
) )
func TestRepo(t *testing.T) { func TestRepo(t *testing.T) {

+ 4
- 4
models/ssh_key.go View File

@ -22,10 +22,10 @@ import (
"github.com/go-xorm/xorm" "github.com/go-xorm/xorm"
"golang.org/x/crypto/ssh" "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 ( const (

+ 1
- 1
models/ssh_key_test.go View File

@ -11,7 +11,7 @@ import (
. "github.com/smartystreets/goconvey/convey" . "github.com/smartystreets/goconvey/convey"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/modules/setting"
) )
func init() { func init() {

+ 1
- 1
models/token.go View File

@ -10,7 +10,7 @@ import (
"github.com/go-xorm/xorm" "github.com/go-xorm/xorm"
gouuid "github.com/satori/go.uuid" 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. // AccessToken represents a personal access token.

+ 1
- 1
models/update.go View File

@ -12,7 +12,7 @@ import (
git "github.com/gogits/git-module" git "github.com/gogits/git-module"
"github.com/gogits/gogs/modules/log"
"github.com/go-gitea/gitea/modules/log"
) )
type UpdateTask struct { type UpdateTask struct {

+ 5
- 5
models/user.go View File

@ -27,11 +27,11 @@ import (
"github.com/gogits/git-module" "github.com/gogits/git-module"
api "github.com/gogits/go-gogs-client" 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 type UserType int

+ 4
- 4
models/webhook.go View File

@ -17,10 +17,10 @@ import (
api "github.com/gogits/go-gogs-client" 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) var HookQueue = sync.NewUniqueQueue(setting.Webhook.QueueLength)

+ 1
- 1
models/webhook_slack.go View File

@ -13,7 +13,7 @@ import (
"github.com/gogits/git-module" "github.com/gogits/git-module"
api "github.com/gogits/go-gogs-client" api "github.com/gogits/go-gogs-client"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/modules/setting"
) )
type SlackMeta struct { type SlackMeta struct {

+ 2
- 2
models/wiki.go View File

@ -17,8 +17,8 @@ import (
"github.com/gogits/git-module" "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() var wikiWorkingPool = sync.NewExclusivePool()

+ 4
- 4
modules/auth/auth.go View File

@ -15,10 +15,10 @@ import (
gouuid "github.com/satori/go.uuid" gouuid "github.com/satori/go.uuid"
"gopkg.in/macaron.v1" "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 { func IsAPIPath(url string) bool {

+ 1
- 1
modules/auth/ldap/ldap.go View File

@ -13,7 +13,7 @@ import (
"gopkg.in/ldap.v2" "gopkg.in/ldap.v2"
"github.com/gogits/gogs/modules/log"
"github.com/go-gitea/gitea/modules/log"
) )
type SecurityProtocol int type SecurityProtocol int

+ 1
- 1
modules/auth/repo_form.go View File

@ -12,7 +12,7 @@ import (
"github.com/go-macaron/binding" "github.com/go-macaron/binding"
"gopkg.in/macaron.v1" "gopkg.in/macaron.v1"
"github.com/gogits/gogs/models"
"github.com/go-gitea/gitea/models"
) )
// _______________________________________ _________.______________________ _______________.___. // _______________________________________ _________.______________________ _______________.___.

+ 2
- 2
modules/base/tool.go View File

@ -26,8 +26,8 @@ import (
"github.com/gogits/chardet" "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. // EncodeMD5 encodes string to md5 hex value.

+ 3
- 3
modules/context/api.go View File

@ -11,9 +11,9 @@ import (
"github.com/Unknwon/paginater" "github.com/Unknwon/paginater"
"gopkg.in/macaron.v1" "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 { type APIContext struct {

+ 1
- 1
modules/context/api_org.go View File

@ -5,7 +5,7 @@
package context package context
import ( import (
"github.com/gogits/gogs/models"
"github.com/go-gitea/gitea/models"
) )
type APIOrganization struct { type APIOrganization struct {

+ 2
- 2
modules/context/auth.go View File

@ -10,8 +10,8 @@ import (
"github.com/go-macaron/csrf" "github.com/go-macaron/csrf"
"gopkg.in/macaron.v1" "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 { type ToggleOptions struct {

+ 5
- 5
modules/context/context.go View File

@ -18,11 +18,11 @@ import (
"github.com/go-macaron/session" "github.com/go-macaron/session"
"gopkg.in/macaron.v1" "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. // Context represents context of a request.

+ 2
- 2
modules/context/org.go View File

@ -9,8 +9,8 @@ import (
"gopkg.in/macaron.v1" "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 { type Organization struct {

+ 3
- 3
modules/context/repo.go View File

@ -16,9 +16,9 @@ import (
"github.com/gogits/git-module" "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 { type PullRequest struct {

+ 3
- 3
modules/cron/cron.go View File

@ -9,9 +9,9 @@ import (
"github.com/gogits/cron" "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() var c = cron.New()

+ 2
- 2
modules/mailer/mailer.go View File

@ -17,8 +17,8 @@ import (
"github.com/jaytaylor/html2text" "github.com/jaytaylor/html2text"
"gopkg.in/gomail.v2" "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 { type Message struct {

+ 2
- 2
modules/markdown/markdown.go View File

@ -18,8 +18,8 @@ import (
"github.com/russross/blackfriday" "github.com/russross/blackfriday"
"golang.org/x/net/html" "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 ( const (

+ 2
- 2
modules/markdown/markdown_test.go View File

@ -1,12 +1,12 @@
package markdown_test package markdown_test
import ( import (
. "github.com/gogits/gogs/modules/markdown"
. "github.com/go-gitea/gitea/modules/markdown"
. "github.com/smartystreets/goconvey/convey" . "github.com/smartystreets/goconvey/convey"
"testing" "testing"
"bytes" "bytes"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/modules/setting"
"github.com/russross/blackfriday" "github.com/russross/blackfriday"
) )

+ 1
- 1
modules/process/manager.go View File

@ -11,7 +11,7 @@ import (
"os/exec" "os/exec"
"time" "time"
"github.com/gogits/gogs/modules/log"
"github.com/go-gitea/gitea/modules/log"
) )
var ( var (

+ 13
- 4
modules/setting/setting.go View File

@ -6,6 +6,7 @@ package setting
import ( import (
"fmt" "fmt"
"net/mail"
"net/url" "net/url"
"os" "os"
"os/exec" "os/exec"
@ -21,12 +22,12 @@ import (
_ "github.com/go-macaron/cache/redis" _ "github.com/go-macaron/cache/redis"
"github.com/go-macaron/session" "github.com/go-macaron/session"
_ "github.com/go-macaron/session/redis" _ "github.com/go-macaron/session/redis"
"github.com/strk/go-libravatar"
"strk.kbt.io/projects/go/libravatar"
"gopkg.in/ini.v1" "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 type Scheme string
@ -714,6 +715,7 @@ type Mailer struct {
Name string Name string
Host string Host string
From string From string
FromEmail string
User, Passwd string User, Passwd string
DisableHelo bool DisableHelo bool
HeloHostname string HeloHostname string
@ -749,6 +751,13 @@ func newMailService() {
EnableHTMLAlternative: sec.Key("ENABLE_HTML_ALTERNATIVE").MustBool(), EnableHTMLAlternative: sec.Key("ENABLE_HTML_ALTERNATIVE").MustBool(),
} }
MailService.From = sec.Key("FROM").MustString(MailService.User) MailService.From = sec.Key("FROM").MustString(MailService.User)
parsed, err := mail.ParseAddress(MailService.From)
if err != nil {
log.Fatal(4, "Invalid mailer.FROM (%s): %v", MailService.From, err)
}
MailService.FromEmail = parsed.Address
log.Info("Mail Service Enabled") log.Info("Mail Service Enabled")
} }

+ 3
- 3
modules/ssh/ssh.go View File

@ -17,9 +17,9 @@ import (
"github.com/Unknwon/com" "github.com/Unknwon/com"
"golang.org/x/crypto/ssh" "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 { func cleanCommand(cmd string) string {

+ 1
- 1
modules/template/highlight/highlight.go View File

@ -8,7 +8,7 @@ import (
"path" "path"
"strings" "strings"
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/modules/setting"
) )
var ( var (

+ 5
- 5
modules/template/template.go View File

@ -19,11 +19,11 @@ import (
"golang.org/x/text/transform" "golang.org/x/text/transform"
"gopkg.in/editorconfig/editorconfig-core-go.v1" "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 { func NewFuncMap() []template.FuncMap {

+ 42
- 22
public/css/gogs.css View File

@ -31,18 +31,23 @@ pre.wrap,
code.wrap { code.wrap {
white-space: pre-wrap; white-space: pre-wrap;
/* CSS 3 */ /* CSS 3 */
word-break: break-word; word-break: break-word;
} }
.dont-break-out { .dont-break-out {
/* These are technically the same, but use both */ /* These are technically the same, but use both */
overflow-wrap: break-word; overflow-wrap: break-word;
word-wrap: break-word; word-wrap: break-word;
-ms-word-break: break-all; -ms-word-break: break-all;
/* This is the dangerous one in WebKit, as it breaks things wherever */ /* This is the dangerous one in WebKit, as it breaks things wherever */
word-break: break-all; word-break: break-all;
/* Instead use this non-standard one: */ /* Instead use this non-standard one: */
word-break: break-word; word-break: break-word;
/* Adds a hyphen where the word breaks, if supported (No Blink) */ /* Adds a hyphen where the word breaks, if supported (No Blink) */
-ms-hyphens: auto; -ms-hyphens: auto;
-moz-hyphens: auto; -moz-hyphens: auto;
-webkit-hyphens: auto; -webkit-hyphens: auto;
@ -812,7 +817,7 @@ footer .ui.language .menu {
border: solid 1px #ccc; border: solid 1px #ccc;
border-bottom-color: #bbb; border-bottom-color: #bbb;
border-radius: 3px; border-radius: 3px;
box-shadow: inset 0 -1px 0 #bbb;
box-shadow: inset 0 -1px 0 #bbbbbb;
} }
.markdown:not(code) input[type="checkbox"] { .markdown:not(code) input[type="checkbox"] {
vertical-align: middle !important; vertical-align: middle !important;
@ -883,7 +888,7 @@ footer .ui.language .menu {
} }
.install form label { .install form label {
text-align: right; text-align: right;
width: 320px !important;
width: 320px;
} }
.install form input { .install form input {
width: 35% !important; width: 35% !important;
@ -892,7 +897,7 @@ footer .ui.language .menu {
text-align: left; text-align: left;
} }
.install form .field .help { .install form .field .help {
margin-left: 335px !important;
margin-left: 335px;
} }
.install form .field.optional .title { .install form .field.optional .title {
margin-left: 38%; margin-left: 38%;
@ -927,18 +932,18 @@ footer .ui.language .menu {
text-align: center; text-align: center;
} }
#create-page-form form .header { #create-page-form form .header {
padding-left: 280px !important;
padding-left: 280px;
} }
#create-page-form form .inline.field > label { #create-page-form form .inline.field > label {
text-align: right; text-align: right;
width: 250px !important;
width: 250px;
word-wrap: break-word; word-wrap: break-word;
} }
#create-page-form form .help { #create-page-form form .help {
margin-left: 265px !important;
margin-left: 265px;
} }
#create-page-form form .optional .title { #create-page-form form .optional .title {
margin-left: 250px !important;
margin-left: 250px;
} }
#create-page-form form input, #create-page-form form input,
#create-page-form form textarea { #create-page-form form textarea {
@ -964,7 +969,7 @@ footer .ui.language .menu {
.user.reset.password form .header, .user.reset.password form .header,
.user.signin form .header, .user.signin form .header,
.user.signup form .header { .user.signup form .header {
padding-left: 280px !important;
padding-left: 280px;
} }
.user.activate form .inline.field > label, .user.activate form .inline.field > label,
.user.forgot.password form .inline.field > label, .user.forgot.password form .inline.field > label,
@ -972,7 +977,7 @@ footer .ui.language .menu {
.user.signin form .inline.field > label, .user.signin form .inline.field > label,
.user.signup form .inline.field > label { .user.signup form .inline.field > label {
text-align: right; text-align: right;
width: 250px !important;
width: 250px;
word-wrap: break-word; word-wrap: break-word;
} }
.user.activate form .help, .user.activate form .help,
@ -980,14 +985,14 @@ footer .ui.language .menu {
.user.reset.password form .help, .user.reset.password form .help,
.user.signin form .help, .user.signin form .help,
.user.signup form .help { .user.signup form .help {
margin-left: 265px !important;
margin-left: 265px;
} }
.user.activate form .optional .title, .user.activate form .optional .title,
.user.forgot.password form .optional .title, .user.forgot.password form .optional .title,
.user.reset.password form .optional .title, .user.reset.password form .optional .title,
.user.signin form .optional .title, .user.signin form .optional .title,
.user.signup form .optional .title { .user.signup form .optional .title {
margin-left: 250px !important;
margin-left: 250px;
} }
.user.activate form input, .user.activate form input,
.user.forgot.password form input, .user.forgot.password form input,
@ -1013,14 +1018,15 @@ footer .ui.language .menu {
.user.reset.password form .header, .user.reset.password form .header,
.user.signin form .header, .user.signin form .header,
.user.signup form .header { .user.signup form .header {
padding-left: 230px !important;
padding-left: 0 !important;
text-align: center;
} }
.user.activate form .inline.field > label, .user.activate form .inline.field > label,
.user.forgot.password form .inline.field > label, .user.forgot.password form .inline.field > label,
.user.reset.password form .inline.field > label, .user.reset.password form .inline.field > label,
.user.signin form .inline.field > label, .user.signin form .inline.field > label,
.user.signup form .inline.field > label { .user.signup form .inline.field > label {
width: 200px !important;
width: 200px;
} }
.repository.new.repo form, .repository.new.repo form,
.repository.new.migrate form, .repository.new.migrate form,
@ -1036,24 +1042,24 @@ footer .ui.language .menu {
.repository.new.repo form .header, .repository.new.repo form .header,
.repository.new.migrate form .header, .repository.new.migrate form .header,
.repository.new.fork form .header { .repository.new.fork form .header {
padding-left: 280px !important;
padding-left: 280px;
} }
.repository.new.repo form .inline.field > label, .repository.new.repo form .inline.field > label,
.repository.new.migrate form .inline.field > label, .repository.new.migrate form .inline.field > label,
.repository.new.fork form .inline.field > label { .repository.new.fork form .inline.field > label {
text-align: right; text-align: right;
width: 250px !important;
width: 250px;
word-wrap: break-word; word-wrap: break-word;
} }
.repository.new.repo form .help, .repository.new.repo form .help,
.repository.new.migrate form .help, .repository.new.migrate form .help,
.repository.new.fork form .help { .repository.new.fork form .help {
margin-left: 265px !important;
margin-left: 265px;
} }
.repository.new.repo form .optional .title, .repository.new.repo form .optional .title,
.repository.new.migrate form .optional .title, .repository.new.migrate form .optional .title,
.repository.new.fork form .optional .title { .repository.new.fork form .optional .title {
margin-left: 250px !important;
margin-left: 250px;
} }
.repository.new.repo form input, .repository.new.repo form input,
.repository.new.migrate form input, .repository.new.migrate form input,
@ -1078,11 +1084,17 @@ footer .ui.language .menu {
.repository.new.fork form .dropdown .text i { .repository.new.fork form .dropdown .text i {
margin-right: 0!important; margin-right: 0!important;
} }
.repository.new.repo form .header,
.repository.new.migrate form .header,
.repository.new.fork form .header {
padding-left: 0 !important;
text-align: center;
}
.repository.new.repo .ui.form .selection.dropdown:not(.owner) { .repository.new.repo .ui.form .selection.dropdown:not(.owner) {
width: 50%!important; width: 50%!important;
} }
.repository.new.repo .ui.form #auto-init { .repository.new.repo .ui.form #auto-init {
margin-left: 265px !important;
margin-left: 265px;
} }
.new.webhook form .help { .new.webhook form .help {
margin-left: 25px; margin-left: 25px;
@ -2328,14 +2340,18 @@ footer .ui.language .menu {
} }
.settings .hook.list .item a { .settings .hook.list .item a {
/* These are technically the same, but use both */ /* These are technically the same, but use both */
overflow-wrap: break-word; overflow-wrap: break-word;
word-wrap: break-word; word-wrap: break-word;
-ms-word-break: break-all; -ms-word-break: break-all;
/* This is the dangerous one in WebKit, as it breaks things wherever */ /* This is the dangerous one in WebKit, as it breaks things wherever */
word-break: break-all; word-break: break-all;
/* Instead use this non-standard one: */ /* Instead use this non-standard one: */
word-break: break-word; word-break: break-word;
/* Adds a hyphen where the word breaks, if supported (No Blink) */ /* Adds a hyphen where the word breaks, if supported (No Blink) */
-ms-hyphens: auto; -ms-hyphens: auto;
-moz-hyphens: auto; -moz-hyphens: auto;
-webkit-hyphens: auto; -webkit-hyphens: auto;
@ -2534,23 +2550,27 @@ footer .ui.language .menu {
text-align: center; text-align: center;
} }
.organization.new.org form .header { .organization.new.org form .header {
padding-left: 280px !important;
padding-left: 280px;
} }
.organization.new.org form .inline.field > label { .organization.new.org form .inline.field > label {
text-align: right; text-align: right;
width: 250px !important;
width: 250px;
word-wrap: break-word; word-wrap: break-word;
} }
.organization.new.org form .help { .organization.new.org form .help {
margin-left: 265px !important;
margin-left: 265px;
} }
.organization.new.org form .optional .title { .organization.new.org form .optional .title {
margin-left: 250px !important;
margin-left: 250px;
} }
.organization.new.org form input, .organization.new.org form input,
.organization.new.org form textarea { .organization.new.org form textarea {
width: 50%!important; width: 50%!important;
} }
.organization.new.org form .header {
padding-left: 0 !important;
text-align: center;
}
.organization.options input { .organization.options input {
min-width: 300px; min-width: 300px;
} }

+ 9
- 4
public/less/_form.less View File

@ -1,9 +1,9 @@
.form { .form {
.help { .help {
color: #999999; color: #999999;
padding-top: .6em;
padding-bottom: .6em;
display: inline-block;
padding-top: .6em;
padding-bottom: .6em;
display: inline-block;
} }
} }
.ui.attached.header { .ui.attached.header {
@ -56,7 +56,8 @@
form { form {
width: 700px!important; width: 700px!important;
.header { .header {
padding-left: @input-padding+30px;
padding-left: 0 !important;
text-align: center;
} }
.inline.field > label { .inline.field > label {
width: @input-padding; width: @input-padding;
@ -81,6 +82,10 @@
} }
} }
} }
.header {
padding-left: 0 !important;
text-align: center;
}
} }
} }

+ 6
- 0
public/less/_organization.less View File

@ -17,6 +17,12 @@
&.new.org { &.new.org {
#create-page-form; #create-page-form;
form {
.header {
padding-left: 0 !important;
text-align: center;
}
}
} }
&.options { &.options {

+ 6
- 6
routers/admin/admin.go View File

@ -13,12 +13,12 @@ import (
"github.com/Unknwon/com" "github.com/Unknwon/com"
"gopkg.in/macaron.v1" "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 ( const (

+ 7
- 7
routers/admin/auths.go View File

@ -10,13 +10,13 @@ import (
"github.com/Unknwon/com" "github.com/Unknwon/com"
"github.com/go-xorm/core" "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 ( const (

+ 5
- 5
routers/admin/notice.go View File

@ -8,11 +8,11 @@ import (
"github.com/Unknwon/com" "github.com/Unknwon/com"
"github.com/Unknwon/paginater" "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 ( const (

+ 5
- 5
routers/admin/orgs.go View File

@ -5,11 +5,11 @@
package admin package admin
import ( 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 ( const (

+ 6
- 6
routers/admin/repos.go View File

@ -5,12 +5,12 @@
package admin package admin
import ( 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 ( const (

+ 7
- 7
routers/admin/users.go View File

@ -9,13 +9,13 @@ import (
"github.com/Unknwon/com" "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 ( const (

+ 4
- 4
routers/api/v1/admin/org.go View File

@ -7,10 +7,10 @@ package admin
import ( import (
api "github.com/gogits/go-gogs-client" 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 // https://github.com/gogits/go-gogs-client/wiki/Administration-Organizations#create-a-new-organization

+ 2
- 2
routers/api/v1/admin/org_repo.go View File

@ -5,8 +5,8 @@
package admin package admin
import ( 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 { func GetRepositoryByParams(ctx *context.APIContext) *models.Repository {

+ 4
- 4
routers/api/v1/admin/org_team.go View File

@ -7,10 +7,10 @@ package admin
import ( import (
api "github.com/gogits/go-gogs-client" 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) { func CreateTeam(ctx *context.APIContext, form api.CreateTeamOption) {

+ 3
- 3
routers/api/v1/admin/repo.go View File

@ -7,9 +7,9 @@ package admin
import ( import (
api "github.com/gogits/go-gogs-client" 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 // https://github.com/gogits/go-gogs-client/wiki/Administration-Repositories#create-a-new-repository

+ 5
- 5
routers/api/v1/admin/user.go View File

@ -7,11 +7,11 @@ package admin
import ( import (
api "github.com/gogits/go-gogs-client" 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) { func parseLoginSource(ctx *context.APIContext, u *models.User, sourceID int64, loginName string) {

+ 8
- 8
routers/api/v1/api.go View File

@ -12,14 +12,14 @@ import (
api "github.com/gogits/go-gogs-client" 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 { func repoAssignment() macaron.Handler {

+ 1
- 1
routers/api/v1/convert/convert.go View File

@ -12,7 +12,7 @@ import (
"github.com/gogits/git-module" "github.com/gogits/git-module"
api "github.com/gogits/go-gogs-client" 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 { func ToEmail(email *models.EmailAddress) *api.Email {

+ 1
- 1
routers/api/v1/convert/utils.go View File

@ -5,7 +5,7 @@
package convert package convert
import ( import (
"github.com/gogits/gogs/modules/setting"
"github.com/go-gitea/gitea/modules/setting"
) )
// ToCorrectPageSize makes sure page size is in allowed range. // ToCorrectPageSize makes sure page size is in allowed range.

+ 2
- 2
routers/api/v1/misc/markdown.go View File

@ -7,8 +7,8 @@ package misc
import ( import (
api "github.com/gogits/go-gogs-client" 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 // https://github.com/gogits/go-gogs-client/wiki/Miscellaneous#render-an-arbitrary-markdown-document

+ 4
- 4
routers/api/v1/org/org.go View File

@ -7,10 +7,10 @@ package org
import ( import (
api "github.com/gogits/go-gogs-client" 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) { func listUserOrgs(ctx *context.APIContext, u *models.User, all bool) {

+ 2
- 2
routers/api/v1/org/team.go View File

@ -7,8 +7,8 @@ package org
import ( import (
api "github.com/gogits/go-gogs-client" 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) { func ListTeams(ctx *context.APIContext) {

+ 2
- 2
routers/api/v1/repo/branch.go View File

@ -7,8 +7,8 @@ package repo
import ( import (
api "github.com/gogits/go-gogs-client" 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 // https://github.com/gogits/go-gogs-client/wiki/Repositories#get-branch

+ 2
- 2
routers/api/v1/repo/collaborators.go View File

@ -7,8 +7,8 @@ package repo
import ( import (
api "github.com/gogits/go-gogs-client" 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) { func AddCollaborator(ctx *context.APIContext, form api.AddCollaboratorOption) {

+ 3
- 3
routers/api/v1/repo/file.go View File

@ -7,9 +7,9 @@ package repo
import ( import (
"github.com/gogits/git-module" "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 // https://github.com/gogits/go-gogs-client/wiki/Repositories-Contents#download-raw-content

+ 3
- 3
routers/api/v1/repo/hook.go View File

@ -11,9 +11,9 @@ import (
api "github.com/gogits/go-gogs-client" 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 // https://github.com/gogits/go-gogs-client/wiki/Repositories#list-hooks

+ 3
- 3
routers/api/v1/repo/issue.go View File

@ -10,9 +10,9 @@ import (
api "github.com/gogits/go-gogs-client" 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) { func ListIssues(ctx *context.APIContext) {

+ 2
- 2
routers/api/v1/repo/issue_comment.go View File

@ -8,8 +8,8 @@ import (
api "github.com/gogits/go-gogs-client" 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) { func ListIssueComments(ctx *context.APIContext) {

+ 2
- 2
routers/api/v1/repo/issue_label.go View File

@ -7,8 +7,8 @@ package repo
import ( import (
api "github.com/gogits/go-gogs-client" 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) { func ListIssueLabels(ctx *context.APIContext) {

+ 4
- 4
routers/api/v1/repo/key.go View File

@ -9,10 +9,10 @@ import (
api "github.com/gogits/go-gogs-client" 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 { func composeDeployKeysAPILink(repoPath string) string {

+ 2
- 2
routers/api/v1/repo/label.go View File

@ -7,8 +7,8 @@ package repo
import ( import (
api "github.com/gogits/go-gogs-client" 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) { func ListLabels(ctx *context.APIContext) {

+ 2
- 2
routers/api/v1/repo/milestone.go View File

@ -9,8 +9,8 @@ import (
api "github.com/gogits/go-gogs-client" 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) { func ListMilestones(ctx *context.APIContext) {

+ 6
- 6
routers/api/v1/repo/repo.go View File

@ -9,12 +9,12 @@ import (
api "github.com/gogits/go-gogs-client" 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 // https://github.com/gogits/go-gogs-client/wiki/Repositories#search-repositories

+ 2
- 2
routers/api/v1/user/app.go View File

@ -7,8 +7,8 @@ package user
import ( import (
api "github.com/gogits/go-gogs-client" 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 // https://github.com/gogits/go-gogs-client/wiki/Users#list-access-tokens-for-a-user

+ 4
- 4
routers/api/v1/user/email.go View File

@ -7,10 +7,10 @@ package user
import ( import (
api "github.com/gogits/go-gogs-client" 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 // https://github.com/gogits/go-gogs-client/wiki/Users-Emails#list-email-addresses-for-a-user

+ 2
- 2
routers/api/v1/user/follower.go View File

@ -7,8 +7,8 @@ package user
import ( import (
api "github.com/gogits/go-gogs-client" 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) { func responseApiUsers(ctx *context.APIContext, users []*models.User) {

+ 5
- 5
routers/api/v1/user/key.go View File

@ -7,11 +7,11 @@ package user
import ( import (
api "github.com/gogits/go-gogs-client" 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 { func GetUserByParamsName(ctx *context.APIContext, name string) *models.User {

+ 2
- 2
routers/api/v1/user/user.go View File

@ -9,8 +9,8 @@ import (
api "github.com/gogits/go-gogs-client" 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) { func Search(ctx *context.APIContext) {

Some files were not shown because too many files changed in this diff

Write Preview
Loading…
Cancel
Save