Skip to content

Commit

Permalink
Change import reference to match gitea instead of gogs (#37)
Browse files Browse the repository at this point in the history
  • Loading branch information
DblK authored and andreynering committed Nov 3, 2016
1 parent 507ce13 commit 2d68bd1
Show file tree
Hide file tree
Showing 123 changed files with 440 additions and 440 deletions.
6 changes: 3 additions & 3 deletions .github/CONTRIBUTING.md
Expand Up @@ -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
Expand All @@ -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

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

Expand Down
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Expand Up @@ -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.

Expand Down
2 changes: 1 addition & 1 deletion .gopmfile
@@ -1,5 +1,5 @@
[target]
path = github.com/gogits/gogs
path = github.com/go-gitea/gitea

[deps]
github.com/bradfitz/gomemcache = commit:fb1f79c
Expand Down
4 changes: 2 additions & 2 deletions 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)
Expand Down
12 changes: 6 additions & 6 deletions 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 |
|:-------------:|:-------:|:-------:|
Expand All @@ -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!
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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.
6 changes: 3 additions & 3 deletions README_ZH.md
Expand Up @@ -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)

### 使用教程
Expand Down Expand Up @@ -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) 文件中。
4 changes: 2 additions & 2 deletions cmd/admin.go
Expand Up @@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions cmd/dump.go
Expand Up @@ -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{
Expand Down
10 changes: 5 additions & 5 deletions cmd/serve.go
Expand Up @@ -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 (
Expand Down
6 changes: 3 additions & 3 deletions cmd/update.go
Expand Up @@ -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{
Expand Down
28 changes: 14 additions & 14 deletions cmd/web.go
Expand Up @@ -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{
Expand Down
2 changes: 1 addition & 1 deletion conf/app.ini
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docker/build.sh
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion glide.yaml
@@ -1,4 +1,4 @@
package: github.com/gogits/gogs
package: github.com/go-gitea/gitea
import:
- package: github.com/Unknwon/cae
subpackages:
Expand Down
4 changes: 2 additions & 2 deletions gogs.go
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion models/access.go
Expand Up @@ -7,7 +7,7 @@ package models
import (
"fmt"

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

type AccessMode int
Expand Down
6 changes: 3 additions & 3 deletions models/action.go
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions models/admin.go
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions models/git_diff.go
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions models/issue.go
Expand Up @@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions models/issue_comment.go
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion models/issue_label.go
Expand Up @@ -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})")
Expand Down
6 changes: 3 additions & 3 deletions models/issue_mail.go
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions models/login_source.go
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions models/mail.go
Expand Up @@ -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 (
Expand Down
6 changes: 3 additions & 3 deletions models/migrations/migrations.go
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions models/models.go
Expand Up @@ -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.
Expand Down

0 comments on commit 2d68bd1

Please sign in to comment.