diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index bd4ff087459e3..5e98bc2e40b48 100644 --- a/.github/CONTRIBUTING.md +++ b/.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 diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index b1cf1a4ecaf89..23a7bfeb40b2b 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.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. diff --git a/.gopmfile b/.gopmfile index 604038b666616..45eb20f2e4a51 100644 --- a/.gopmfile +++ b/.gopmfile @@ -1,5 +1,5 @@ [target] -path = github.com/gogits/gogs +path = github.com/go-gitea/gitea [deps] github.com/bradfitz/gomemcache = commit:fb1f79c diff --git a/Makefile b/Makefile index c321f82badf22..b3ee101959849 100644 --- a/Makefile +++ b/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) diff --git a/README.md b/README.md index e465972dfff37..7eaeea9e9e322 100644 --- a/README.md +++ b/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. diff --git a/README_ZH.md b/README_ZH.md index 077cf86d5c890..c3605da594496 100644 --- a/README_ZH.md +++ b/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) 文件中。 diff --git a/cmd/admin.go b/cmd/admin.go index bad36b1c85c5b..a10e0e5fe5409 100644 --- a/cmd/admin.go +++ b/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 ( diff --git a/cmd/dump.go b/cmd/dump.go index c1361f932852f..1e03ef74f0ef0 100644 --- a/cmd/dump.go +++ b/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{ diff --git a/cmd/serve.go b/cmd/serve.go index 53d33b2edd565..051e215db1bc9 100644 --- a/cmd/serve.go +++ b/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 ( diff --git a/cmd/update.go b/cmd/update.go index bebc10160931e..450d18a08ad1e 100644 --- a/cmd/update.go +++ b/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{ diff --git a/cmd/web.go b/cmd/web.go index 97f6a0f15c746..5f92c774135b1 100644 --- a/cmd/web.go +++ b/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{ diff --git a/conf/app.ini b/conf/app.ini index 8110ac851d45f..0f6163c4f4fbd 100644 --- a/conf/app.ini +++ b/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 diff --git a/docker/build.sh b/docker/build.sh index da36d7e6e0f58..fb98b12b878e3 100755 --- a/docker/build.sh +++ b/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" diff --git a/glide.yaml b/glide.yaml index e761d9c2d9f0e..1de38e02d10a5 100644 --- a/glide.yaml +++ b/glide.yaml @@ -1,4 +1,4 @@ -package: github.com/gogits/gogs +package: github.com/go-gitea/gitea import: - package: github.com/Unknwon/cae subpackages: diff --git a/gogs.go b/gogs.go index 2cabeeda7874a..0235a2088344c 100644 --- a/gogs.go +++ b/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" diff --git a/models/access.go b/models/access.go index b3be9b5bb66ff..e46819f2d4385 100644 --- a/models/access.go +++ b/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 diff --git a/models/action.go b/models/action.go index 54695417a7750..d47ba87d7f4aa 100644 --- a/models/action.go +++ b/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 diff --git a/models/admin.go b/models/admin.go index 68731a2433ed9..3f17c2fdaa86c 100644 --- a/models/admin.go +++ b/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 diff --git a/models/git_diff.go b/models/git_diff.go index 107f630ff9ca1..e3d5df26481f7 100644 --- a/models/git_diff.go +++ b/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 diff --git a/models/issue.go b/models/issue.go index 208204b0767ee..be9eedcd2bf14 100644 --- a/models/issue.go +++ b/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 ( diff --git a/models/issue_comment.go b/models/issue_comment.go index ccfa765f927a3..1c615ab5115e1 100644 --- a/models/issue_comment.go +++ b/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. diff --git a/models/issue_label.go b/models/issue_label.go index 13bf2005f30d7..0b9644c24921e 100644 --- a/models/issue_label.go +++ b/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})") diff --git a/models/issue_mail.go b/models/issue_mail.go index 02548bc3ed289..8a4945c645520 100644 --- a/models/issue_mail.go +++ b/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 { diff --git a/models/login_source.go b/models/login_source.go index 584f3f9bc9287..c9a0c73764075 100644 --- a/models/login_source.go +++ b/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 diff --git a/models/mail.go b/models/mail.go index 85f1560b449cc..df5fd789bc13b 100644 --- a/models/mail.go +++ b/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 ( diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index edd07a66ec1d3..66e5d831e871c 100644 --- a/models/migrations/migrations.go +++ b/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 diff --git a/models/models.go b/models/models.go index 0cf422a9a16db..a9da88462448e 100644 --- a/models/models.go +++ b/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. diff --git a/models/org.go b/models/org.go index 706b1889790c8..1fd6039b6dcf3 100644 --- a/models/org.go +++ b/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 ( diff --git a/models/pull.go b/models/pull.go index 100d4db4358eb..f582adccb0bd3 100644 --- a/models/pull.go +++ b/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) diff --git a/models/release.go b/models/release.go index c79ff222e5338..2fd47813d1ad6 100644 --- a/models/release.go +++ b/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. diff --git a/models/repo.go b/models/repo.go index 010c9fad6083f..7c4e475ddad94 100644 --- a/models/repo.go +++ b/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 ( diff --git a/models/repo_editor.go b/models/repo_editor.go index dfdb864a1c0f2..33d69e35b2f15 100644 --- a/models/repo_editor.go +++ b/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" ) // ___________ .___.__ __ ___________.__.__ diff --git a/models/repo_mirror.go b/models/repo_mirror.go index 8835c40d2f53b..9688f579ab52b 100644 --- a/models/repo_mirror.go +++ b/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) diff --git a/models/repo_test.go b/models/repo_test.go index 69d90b938fcf7..9ab27ba6192e1 100644 --- a/models/repo_test.go +++ b/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) { diff --git a/models/ssh_key.go b/models/ssh_key.go index 0925b9ba76687..77adce9f3be59 100644 --- a/models/ssh_key.go +++ b/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 ( diff --git a/models/ssh_key_test.go b/models/ssh_key_test.go index 1cda60c508749..e748f381c3bb1 100644 --- a/models/ssh_key_test.go +++ b/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() { diff --git a/models/token.go b/models/token.go index 2c1f64ce03ea1..5d9053cc20606 100644 --- a/models/token.go +++ b/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. diff --git a/models/update.go b/models/update.go index 79d62c8f6a8ae..80d222c5d3028 100644 --- a/models/update.go +++ b/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 { diff --git a/models/user.go b/models/user.go index 946c6c94d4764..32242e0ea6b75 100644 --- a/models/user.go +++ b/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 diff --git a/models/webhook.go b/models/webhook.go index 084a7ee73f698..534e69135bb07 100644 --- a/models/webhook.go +++ b/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) diff --git a/models/webhook_slack.go b/models/webhook_slack.go index edc26a78f3ba7..9cfbaf25c25c0 100644 --- a/models/webhook_slack.go +++ b/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 { diff --git a/models/wiki.go b/models/wiki.go index bc8aaf666e509..f4bf7a3b7f47c 100644 --- a/models/wiki.go +++ b/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() diff --git a/modules/auth/auth.go b/modules/auth/auth.go index 3265b326c6a2a..c19bffe710e71 100644 --- a/modules/auth/auth.go +++ b/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 { diff --git a/modules/auth/ldap/ldap.go b/modules/auth/ldap/ldap.go index 55364bfccec5f..b110fe62348b1 100644 --- a/modules/auth/ldap/ldap.go +++ b/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 diff --git a/modules/auth/repo_form.go b/modules/auth/repo_form.go index d1e28dc11944d..589997f1517af 100644 --- a/modules/auth/repo_form.go +++ b/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" ) // _______________________________________ _________.______________________ _______________.___. diff --git a/modules/base/tool.go b/modules/base/tool.go index 52d1e178dbabb..8cc90c0b9a1e6 100644 --- a/modules/base/tool.go +++ b/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. diff --git a/modules/context/api.go b/modules/context/api.go index 770daa3ad3f71..62be56d320ea8 100644 --- a/modules/context/api.go +++ b/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 { diff --git a/modules/context/api_org.go b/modules/context/api_org.go index ecf60a19052fe..c0cdf7b3abf8c 100644 --- a/modules/context/api_org.go +++ b/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 { diff --git a/modules/context/auth.go b/modules/context/auth.go index 746771791e898..807183e452876 100644 --- a/modules/context/auth.go +++ b/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 { diff --git a/modules/context/context.go b/modules/context/context.go index ac46bb38fb672..82e3cbf27bdcd 100644 --- a/modules/context/context.go +++ b/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. diff --git a/modules/context/org.go b/modules/context/org.go index 24ef5ef6a8b5a..880554a4b1bf3 100644 --- a/modules/context/org.go +++ b/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 { diff --git a/modules/context/repo.go b/modules/context/repo.go index f078523e7584d..e4c2c597c5e96 100644 --- a/modules/context/repo.go +++ b/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 { diff --git a/modules/cron/cron.go b/modules/cron/cron.go index 7695b974bbfd2..d0c769ca99875 100644 --- a/modules/cron/cron.go +++ b/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() diff --git a/modules/mailer/mailer.go b/modules/mailer/mailer.go index 32f25f5b57f1d..098e1367218e2 100644 --- a/modules/mailer/mailer.go +++ b/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 { diff --git a/modules/markdown/markdown.go b/modules/markdown/markdown.go index 6724b248ad0bb..100a4df10f8aa 100644 --- a/modules/markdown/markdown.go +++ b/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 ( diff --git a/modules/markdown/markdown_test.go b/modules/markdown/markdown_test.go index d4071ba3562ca..9de8f11dc485d 100644 --- a/modules/markdown/markdown_test.go +++ b/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" ) diff --git a/modules/process/manager.go b/modules/process/manager.go index 1f98ca7cfb1a9..b259a2778333e 100644 --- a/modules/process/manager.go +++ b/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 ( diff --git a/modules/setting/setting.go b/modules/setting/setting.go index 7696c09127dd2..102d758dd6760 100644 --- a/modules/setting/setting.go +++ b/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 diff --git a/modules/ssh/ssh.go b/modules/ssh/ssh.go index ceecc9bbfcca1..b6dc1d15a4469 100644 --- a/modules/ssh/ssh.go +++ b/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 { diff --git a/modules/template/highlight/highlight.go b/modules/template/highlight/highlight.go index bbf08e043621d..360ab6a73ead6 100644 --- a/modules/template/highlight/highlight.go +++ b/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 ( diff --git a/modules/template/template.go b/modules/template/template.go index 3a6eb042bb923..3fe49fa38093f 100644 --- a/modules/template/template.go +++ b/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 { diff --git a/routers/admin/admin.go b/routers/admin/admin.go index 1b22251e557c9..843860306bc8d 100644 --- a/routers/admin/admin.go +++ b/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 ( diff --git a/routers/admin/auths.go b/routers/admin/auths.go index df2512aa069d7..dcd9a225a797b 100644 --- a/routers/admin/auths.go +++ b/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 ( diff --git a/routers/admin/notice.go b/routers/admin/notice.go index 5d4e807ee41c3..80b7aa29450f7 100644 --- a/routers/admin/notice.go +++ b/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 ( diff --git a/routers/admin/orgs.go b/routers/admin/orgs.go index 32000721074b7..efda1e5165c63 100644 --- a/routers/admin/orgs.go +++ b/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 ( diff --git a/routers/admin/repos.go b/routers/admin/repos.go index 5eacb5ed38014..2c32070ed35fb 100644 --- a/routers/admin/repos.go +++ b/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 ( diff --git a/routers/admin/users.go b/routers/admin/users.go index eb91ea2fdf65b..0eaa3c995c0e8 100644 --- a/routers/admin/users.go +++ b/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 ( diff --git a/routers/api/v1/admin/org.go b/routers/api/v1/admin/org.go index e82fc3ed66ce5..5e594e1e5f07d 100644 --- a/routers/api/v1/admin/org.go +++ b/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 diff --git a/routers/api/v1/admin/org_repo.go b/routers/api/v1/admin/org_repo.go index 71c84ad0efb29..01835fa2ab160 100644 --- a/routers/api/v1/admin/org_repo.go +++ b/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 { diff --git a/routers/api/v1/admin/org_team.go b/routers/api/v1/admin/org_team.go index c0f3487e11ba6..7a28d9566ebb8 100644 --- a/routers/api/v1/admin/org_team.go +++ b/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) { diff --git a/routers/api/v1/admin/repo.go b/routers/api/v1/admin/repo.go index 0f0c3862deece..e673447c4bf00 100644 --- a/routers/api/v1/admin/repo.go +++ b/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 diff --git a/routers/api/v1/admin/user.go b/routers/api/v1/admin/user.go index 6d38dee128e74..b25c687d2fbc5 100644 --- a/routers/api/v1/admin/user.go +++ b/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) { diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index 0591cddb86ccf..2d468eae5fe25 100644 --- a/routers/api/v1/api.go +++ b/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 { diff --git a/routers/api/v1/convert/convert.go b/routers/api/v1/convert/convert.go index fcadb51fd4299..49c1941a467e8 100644 --- a/routers/api/v1/convert/convert.go +++ b/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 { diff --git a/routers/api/v1/convert/utils.go b/routers/api/v1/convert/utils.go index f34fb3d2b669a..0062157c842d4 100644 --- a/routers/api/v1/convert/utils.go +++ b/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. diff --git a/routers/api/v1/misc/markdown.go b/routers/api/v1/misc/markdown.go index 64895db072e08..8ca5cde953975 100644 --- a/routers/api/v1/misc/markdown.go +++ b/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 diff --git a/routers/api/v1/org/org.go b/routers/api/v1/org/org.go index 7b2cfcd1dc61a..3f26f5510de69 100644 --- a/routers/api/v1/org/org.go +++ b/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) { diff --git a/routers/api/v1/org/team.go b/routers/api/v1/org/team.go index 70f8d84206210..0c87ce26b9787 100644 --- a/routers/api/v1/org/team.go +++ b/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) { diff --git a/routers/api/v1/repo/branch.go b/routers/api/v1/repo/branch.go index a141921eac05d..f4327378dc0f9 100644 --- a/routers/api/v1/repo/branch.go +++ b/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 diff --git a/routers/api/v1/repo/collaborators.go b/routers/api/v1/repo/collaborators.go index e14875cbecd27..cfb21189057c4 100644 --- a/routers/api/v1/repo/collaborators.go +++ b/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) { diff --git a/routers/api/v1/repo/file.go b/routers/api/v1/repo/file.go index ee9d15a322755..0dabea8b96727 100644 --- a/routers/api/v1/repo/file.go +++ b/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 diff --git a/routers/api/v1/repo/hook.go b/routers/api/v1/repo/hook.go index 3b36055db5406..315172199b228 100644 --- a/routers/api/v1/repo/hook.go +++ b/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 diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go index fe967ae0a51a2..9193c02106328 100644 --- a/routers/api/v1/repo/issue.go +++ b/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) { diff --git a/routers/api/v1/repo/issue_comment.go b/routers/api/v1/repo/issue_comment.go index 3957600b7b5e2..71ce19fe332b4 100644 --- a/routers/api/v1/repo/issue_comment.go +++ b/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) { diff --git a/routers/api/v1/repo/issue_label.go b/routers/api/v1/repo/issue_label.go index f1eed2112a549..0d520a4f935f4 100644 --- a/routers/api/v1/repo/issue_label.go +++ b/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) { diff --git a/routers/api/v1/repo/key.go b/routers/api/v1/repo/key.go index 563dac2615b7d..ec60bc516bad2 100644 --- a/routers/api/v1/repo/key.go +++ b/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 { diff --git a/routers/api/v1/repo/label.go b/routers/api/v1/repo/label.go index 705206cef7ebc..efa68b0a1dc06 100644 --- a/routers/api/v1/repo/label.go +++ b/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) { diff --git a/routers/api/v1/repo/milestone.go b/routers/api/v1/repo/milestone.go index 652ccbb5c6231..8913190f6d60d 100644 --- a/routers/api/v1/repo/milestone.go +++ b/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) { diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go index cc75f5bf4e356..e6890ca33d3d5 100644 --- a/routers/api/v1/repo/repo.go +++ b/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 diff --git a/routers/api/v1/user/app.go b/routers/api/v1/user/app.go index 165f6eb8ecbfd..90b571dbba2f3 100644 --- a/routers/api/v1/user/app.go +++ b/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 diff --git a/routers/api/v1/user/email.go b/routers/api/v1/user/email.go index 1f615cdff35a1..1643f2b0aefa7 100644 --- a/routers/api/v1/user/email.go +++ b/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 diff --git a/routers/api/v1/user/follower.go b/routers/api/v1/user/follower.go index 58a162444be41..0f0e7fcec32e9 100644 --- a/routers/api/v1/user/follower.go +++ b/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) { diff --git a/routers/api/v1/user/key.go b/routers/api/v1/user/key.go index 3e407feff875b..ba4c1e1ee1ecf 100644 --- a/routers/api/v1/user/key.go +++ b/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 { diff --git a/routers/api/v1/user/user.go b/routers/api/v1/user/user.go index b526af5da7822..6258662b6879e 100644 --- a/routers/api/v1/user/user.go +++ b/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) { diff --git a/routers/dev/template.go b/routers/dev/template.go index ee81f3804abe3..515b2e3bd1c2b 100644 --- a/routers/dev/template.go +++ b/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) { diff --git a/routers/home.go b/routers/home.go index 22a131a6267b9..10e75269b8d3b 100644 --- a/routers/home.go +++ b/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 ( diff --git a/routers/install.go b/routers/install.go index 651f2f2f5db39..01187916358b5 100644 --- a/routers/install.go +++ b/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 ( diff --git a/routers/org/members.go b/routers/org/members.go index 15998aa274ba4..e3aab7481e693 100644 --- a/routers/org/members.go +++ b/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 ( diff --git a/routers/org/org.go b/routers/org/org.go index 1a7800d955234..156ccb3ee6d88 100644 --- a/routers/org/org.go +++ b/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 ( diff --git a/routers/org/setting.go b/routers/org/setting.go index 14681e4c59c57..2169779232179 100644 --- a/routers/org/setting.go +++ b/routers/org/setting.go @@ -7,13 +7,13 @@ package org import ( "strings" - "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/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/log" + "github.com/go-gitea/gitea/modules/setting" + "github.com/go-gitea/gitea/routers/user" ) const ( diff --git a/routers/org/teams.go b/routers/org/teams.go index 3d0456423a5c4..c6636aa836dc3 100644 --- a/routers/org/teams.go +++ b/routers/org/teams.go @@ -9,11 +9,11 @@ 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/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" ) const ( diff --git a/routers/repo/branch.go b/routers/repo/branch.go index 00f30b0f1346f..139b3fb2375e9 100644 --- a/routers/repo/branch.go +++ b/routers/repo/branch.go @@ -5,8 +5,8 @@ package repo import ( - "github.com/gogits/gogs/modules/base" - "github.com/gogits/gogs/modules/context" + "github.com/go-gitea/gitea/modules/base" + "github.com/go-gitea/gitea/modules/context" ) const ( diff --git a/routers/repo/commit.go b/routers/repo/commit.go index b9ced49ed2e88..a8e96f0e5edd7 100644 --- a/routers/repo/commit.go +++ b/routers/repo/commit.go @@ -12,10 +12,10 @@ import ( "github.com/gogits/git-module" - "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" ) const ( diff --git a/routers/repo/download.go b/routers/repo/download.go index faa30ac9d7a83..c1f8142cd8321 100644 --- a/routers/repo/download.go +++ b/routers/repo/download.go @@ -10,8 +10,8 @@ import ( "github.com/gogits/git-module" - "github.com/gogits/gogs/modules/base" - "github.com/gogits/gogs/modules/context" + "github.com/go-gitea/gitea/modules/base" + "github.com/go-gitea/gitea/modules/context" ) func ServeData(ctx *context.Context, name string, reader io.Reader) error { diff --git a/routers/repo/editor.go b/routers/repo/editor.go index 428a25d568b2c..641cadcb920e4 100644 --- a/routers/repo/editor.go +++ b/routers/repo/editor.go @@ -12,13 +12,13 @@ import ( "strings" "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/log" - "github.com/gogits/gogs/modules/setting" - "github.com/gogits/gogs/modules/template" + "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/modules/template" ) const ( diff --git a/routers/repo/http.go b/routers/repo/http.go index 80afcec410e02..a97593f26e1d0 100644 --- a/routers/repo/http.go +++ b/routers/repo/http.go @@ -22,11 +22,11 @@ import ( git "github.com/gogits/git-module" - "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" ) func HTTP(ctx *context.Context) { diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 21d4c7d964e6a..76d81d0e76f9b 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -17,13 +17,13 @@ import ( "github.com/Unknwon/com" "github.com/Unknwon/paginater" - "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/markdown" - "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/markdown" + "github.com/go-gitea/gitea/modules/setting" ) const ( diff --git a/routers/repo/pull.go b/routers/repo/pull.go index d5d9bc9b0715a..d345dbee06e0b 100644 --- a/routers/repo/pull.go +++ b/routers/repo/pull.go @@ -13,12 +13,12 @@ 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/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 ( diff --git a/routers/repo/release.go b/routers/repo/release.go index d612a1cec5215..9d87f0967e0a1 100644 --- a/routers/repo/release.go +++ b/routers/repo/release.go @@ -7,12 +7,12 @@ package repo import ( "fmt" - "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/markdown" + "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/markdown" ) const ( diff --git a/routers/repo/repo.go b/routers/repo/repo.go index 74ee3c4ff8cbe..6816124721506 100644 --- a/routers/repo/repo.go +++ b/routers/repo/repo.go @@ -14,12 +14,12 @@ 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/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 ( diff --git a/routers/repo/setting.go b/routers/repo/setting.go index 80b44ad220e5b..4bcc470e99e27 100644 --- a/routers/repo/setting.go +++ b/routers/repo/setting.go @@ -10,12 +10,12 @@ 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/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 ( diff --git a/routers/repo/view.go b/routers/repo/view.go index c04ef1ee3fc44..3bb551f2e0749 100644 --- a/routers/repo/view.go +++ b/routers/repo/view.go @@ -16,14 +16,14 @@ import ( "github.com/gogits/git-module" - "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/markdown" - "github.com/gogits/gogs/modules/setting" - "github.com/gogits/gogs/modules/template" - "github.com/gogits/gogs/modules/template/highlight" + "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/markdown" + "github.com/go-gitea/gitea/modules/setting" + "github.com/go-gitea/gitea/modules/template" + "github.com/go-gitea/gitea/modules/template/highlight" ) const ( diff --git a/routers/repo/webhook.go b/routers/repo/webhook.go index d3605b2a4296c..0c2f7c383ed31 100644 --- a/routers/repo/webhook.go +++ b/routers/repo/webhook.go @@ -15,11 +15,11 @@ import ( git "github.com/gogits/git-module" api "github.com/gogits/go-gogs-client" - "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/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/setting" ) const ( diff --git a/routers/repo/wiki.go b/routers/repo/wiki.go index a20bea25df86b..4043a96bee176 100644 --- a/routers/repo/wiki.go +++ b/routers/repo/wiki.go @@ -11,11 +11,11 @@ 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/markdown" + "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/markdown" ) const ( diff --git a/routers/user/auth.go b/routers/user/auth.go index 7117f1ec7f015..b50a3605610a2 100644 --- a/routers/user/auth.go +++ b/routers/user/auth.go @@ -10,12 +10,12 @@ import ( "github.com/go-macaron/captcha" - "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 ( diff --git a/routers/user/home.go b/routers/user/home.go index 83b4b26166cab..fb079546e733e 100644 --- a/routers/user/home.go +++ b/routers/user/home.go @@ -11,10 +11,10 @@ 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/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" ) const ( diff --git a/routers/user/profile.go b/routers/user/profile.go index 363705dd0164a..6c3f51a9dad2c 100644 --- a/routers/user/profile.go +++ b/routers/user/profile.go @@ -11,11 +11,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/repo" + "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/repo" ) const ( diff --git a/routers/user/setting.go b/routers/user/setting.go index 10e8fd02b6ed5..35763ab48d33b 100644 --- a/routers/user/setting.go +++ b/routers/user/setting.go @@ -12,12 +12,12 @@ 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/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 ( diff --git a/scripts/supervisor/gogs b/scripts/supervisor/gogs index 51531fb79df84..39323521aac28 100644 --- a/scripts/supervisor/gogs +++ b/scripts/supervisor/gogs @@ -1,6 +1,6 @@ [program:gogs] -directory=/home/git/go/src/github.com/gogits/gogs/ -command=/home/git/go/src/github.com/gogits/gogs/gogs web +directory=/home/git/go/src/github.com/go-gitea/gitea/ +command=/home/git/go/src/github.com/go-gitea/gitea/gogs web autostart=true autorestart=true startsecs=10 diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl index 3f0190528d3f5..7b5398633d3e3 100644 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -11,7 +11,7 @@
{{if .ShowFooterBranding}} - GitHub + GitHub Twitter Sina Weibo {{end}} diff --git a/templates/home.tmpl b/templates/home.tmpl index 8272db20c8bfd..4ed06d3a7c7ec 100644 --- a/templates/home.tmpl +++ b/templates/home.tmpl @@ -20,7 +20,7 @@ Einfach zu installieren

- Starte einfach die Anwendung für deine Plattform. Gogs gibt es auch für Docker, Vagrant oder als Installationspaket. + Starte einfach die Anwendung für deine Plattform. Gogs gibt es auch für Docker, Vagrant oder als Installationspaket.

@@ -46,7 +46,7 @@ Quelloffen

- Der komplette Code befindet sich auf GitHub! Unterstütze uns bei der Verbesserung dieses Projekts. Trau dich! + Der komplette Code befindet sich auf GitHub! Unterstütze uns bei der Verbesserung dieses Projekts. Trau dich!

@@ -57,7 +57,7 @@ 易安装

- 您除了可以根据操作系统平台通过 二进制运行，还可以通过 Docker 或 Vagrant，以及 包管理 安装。 + 您除了可以根据操作系统平台通过 二进制运行，还可以通过 Docker 或 Vagrant，以及 包管理 安装。

@@ -83,7 +83,7 @@ 开源化

- 所有的代码都开源在 GitHub 上，赶快加入我们来共同发展这个伟大的项目！还等什么？成为贡献者吧！ + 所有的代码都开源在 GitHub 上，赶快加入我们来共同发展这个伟大的项目！还等什么？成为贡献者吧！

@@ -95,7 +95,7 @@

Il suffit de lancer l'exécutable correspondant à votre système. - Ou d'utiliser Gogs avec Docker ou + Ou d'utiliser Gogs avec Docker ou Vagrant ou en l'installant depuis un package.

@@ -123,7 +123,7 @@ Open Source

- Toutes les sources sont sur GitHub ! Rejoignez-nous et contribuez à rendre ce projet encore meilleur. + Toutes les sources sont sur GitHub ! Rejoignez-nous et contribuez à rendre ce projet encore meilleur.

@@ -134,7 +134,7 @@ Fácil de instalar

- Simplemente arranca el binario para tu plataforma. O usa Gogs con Docker o Vagrant, o utilice el paquete. + Simplemente arranca el binario para tu plataforma. O usa Gogs con Docker o Vagrant, o utilice el paquete.

@@ -160,7 +160,7 @@ Open Source

- ¡Está todo en GitHub! Uniros contribuyendo a hacer este proyecto todavía mejor. ¡No seas tímido y colabora! + ¡Está todo en GitHub! Uniros contribuyendo a hacer este proyecto todavía mejor. ¡No seas tímido y colabora!

@@ -171,7 +171,7 @@ Fácil de instalar

- Simplesmente rode o executável para o seu sistema operacional. Ou obtenha o Gogs com o Docker ou Vagrant, ou baixe o pacote. + Simplesmente rode o executável para o seu sistema operacional. Ou obtenha o Gogs com o Docker ou Vagrant, ou baixe o pacote.

@@ -197,7 +197,7 @@ Código aberto

- Está tudo no GitHub! Contribua e torne este projeto ainda melhor. Não tenha vergonha de contribuir! + Está tudo no GitHub! Contribua e torne este projeto ainda melhor. Não tenha vergonha de contribuir!

@@ -208,7 +208,7 @@ Простой в установке

- Просто запустите исполняемый файл для вашей платформы. Изпользуйте Gogs с Docker или Vagrant, или загрузите пакет. + Просто запустите исполняемый файл для вашей платформы. Изпользуйте Gogs с Docker или Vagrant, или загрузите пакет.

@@ -234,7 +234,7 @@ Открытый исходный код

- Всё это на GitHub! Присоединяйтесь к нам, внося вклад, чтобы сделать этот проект еще лучше. Не бойтесь помогать! + Всё это на GitHub! Присоединяйтесь к нам, внося вклад, чтобы сделать этот проект еще лучше. Не бойтесь помогать!

@@ -245,7 +245,7 @@ Easy to install

- Simply run the binary for your platform. Or ship Gogs with Docker or Vagrant, or get it packaged. + Simply run the binary for your platform. Or ship Gogs with Docker or Vagrant, or get it packaged.

@@ -271,7 +271,7 @@ Open Source

- It's all on GitHub! Join us by contributing to make this project even better. Don't be shy to be a contributor! + It's all on GitHub! Join us by contributing to make this project even better. Don't be shy to be a contributor!

diff --git a/templates/install.tmpl b/templates/install.tmpl index c8c2cbd05ab71..2f1de90d8ef1e 100644 --- a/templates/install.tmpl +++ b/templates/install.tmpl @@ -8,7 +8,7 @@
{{template "base/alert" .}} -

{{.i18n.Tr "install.docker_helper" "https://github.com/gogits/gogs/tree/master/docker" | Safe}}

+

{{.i18n.Tr "install.docker_helper" "https://github.com/go-gitea/gitea/tree/master/docker" | Safe}}

diff --git a/templates/status/404.tmpl b/templates/status/404.tmpl index 776f4fb78e924..fa3d340dd5bb4 100644 --- a/templates/status/404.tmpl +++ b/templates/status/404.tmpl @@ -4,6 +4,6 @@

{{if .ShowFooterVersion}}

Application Version: {{AppVer}}

{{end}} -

If you think this is an error, please open an issue on GitHub.

+

If you think this is an error, please open an issue on GitHub.

{{template "base/footer" .}}