Skip to content

Commit 1adde07

Browse files
authored
Merge branch 'master' into fix/3743-route-regexp-branchname
2 parents 8ea63f8 + 42a744d commit 1adde07

File tree

129 files changed

+545
-488
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

129 files changed

+545
-488
lines changed

.github/CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Depends on the situation, you will:
1515

1616
### Bug Report
1717

18-
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:
18+
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:
1919

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

27-
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.
27+
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.
2828

2929
#### Bug Report Example
3030

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

4343
### Pull Request
4444

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

4747
### Ask For Help
4848

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ The pull request will be closed without any reasons if it does not satisfy any o
22

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

.gopmfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[target]
2-
path = github.com/gogits/gogs
2+
path = github.com/go-gitea/gitea
33

44
[deps]
55
github.com/bradfitz/gomemcache = commit:fb1f79c
@@ -35,7 +35,7 @@ github.com/nfnt/resize = commit:891127d
3535
github.com/russross/blackfriday = commit:93622da
3636
github.com/satori/go.uuid = commit:0aa62d5
3737
github.com/sergi/go-diff = commit:ec7fdbb
38-
github.com/strk/go-libravatar = commit:5eed7bf
38+
strk.kbt.io/projects/go/libravatar = commit:5eed7bf
3939
github.com/shurcooL/sanitized_anchor_name = commit:10ef21a
4040
github.com/Unknwon/cae = commit:7f5e046
4141
github.com/Unknwon/com = commit:28b053d

.lgtm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
self_approval_off = false

.travis.yml

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,34 @@
11
language: go
22

33
go:
4-
- 1.4
5-
- 1.5
64
- 1.6
75
- 1.7
86

97
before_install:
108
- sudo apt-get update -qq
119
- sudo apt-get install -y libpam-dev
12-
- go get github.com/msteinert/pam
10+
- go get github.com/msteinert/pam
1311

1412
install:
1513
- go get -t -v ./...
1614

17-
script:
18-
- go build -v -tags "pam"
19-
- go test -v -cover -race ./...
15+
script: |
16+
go build -v -tags "pam"
17+
18+
for pkg in $(go list ./... | grep -v /vendor/)
19+
do
20+
go test -v -race -cover -coverprofile $GOPATH/src/$pkg/coverage.out $pkg || exit 1
21+
done
22+
23+
after_success:
24+
- bash <(curl -s https://codecov.io/bash)
2025

2126
notifications:
22-
email:
23-
24-
slack: gophercn:o5pSanyTeNhnfYc3QnG0X7Wx
2527
webhooks:
28+
on_success: change
29+
on_failure: always
30+
on_start: never
2631
urls:
27-
- https://webhooks.gitter.im/e/b590f8e03882f7aedc3e
28-
on_success: change
29-
on_failure: always
30-
on_start: never
32+
- https://webhooks.gitter.im/e/ee6b822f3cf54c98e70c
33+
- https://webhooks.gitter.im/e/87428658ef177ce8a7e4
34+
- https://webhooks.gitter.im/e/a1d2b69804dfda72187e

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
LDFLAGS += -X "github.com/gogits/gogs/modules/setting.BuildTime=$(shell date -u '+%Y-%m-%d %I:%M:%S %Z')"
2-
LDFLAGS += -X "github.com/gogits/gogs/modules/setting.BuildGitHash=$(shell git rev-parse HEAD)"
1+
LDFLAGS += -X "github.com/go-gitea/gitea/modules/setting.BuildTime=$(shell date -u '+%Y-%m-%d %I:%M:%S %Z')"
2+
LDFLAGS += -X "github.com/go-gitea/gitea/modules/setting.BuildGitHash=$(shell git rev-parse HEAD)"
33

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

README.md

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
1-
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)
2-
=====================
1+
# Gitea - Git with a cup of tea
32

4-
![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true)
3+
[![Build Status](https://travis-ci.org/go-gitea/gitea.svg?branch=master)](https://travis-ci.org/go-gitea/gitea)
4+
[![codecov](https://codecov.io/gh/go-gitea/gitea/branch/master/graph/badge.svg)](https://codecov.io/gh/go-gitea/gitea)
5+
[![Go Report Card](https://goreportcard.com/badge/github.com/go-gitea/gitea)](https://goreportcard.com/report/github.com/go-gitea/gitea)
6+
[![GoDoc](https://godoc.org/github.com/go-gitea/gitea?status.svg)](https://godoc.org/github.com/go-gitea/gitea)
7+
[![](https://images.microbadger.com/badges/image/gitea/gitea.svg)](http://microbadger.com/images/gitea/gitea "Get your own image badge on microbadger.com")
8+
[![Join the chat at https://gitter.im/go-gitea/gitea](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/go-gitea/gitea?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
59

6-
##### 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/))
10+
![](https://github.com/go-gitea/gitea/blob/master/public/img/gogs-large-resize.png?raw=true)
11+
12+
##### 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/))
713

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

1420
### Important Notes
1521

16-
1. **YOU MUST READ [Contributing Code](https://github.com/gogits/gogs/wiki/Contributing-Code) BEFORE STARTING TO WORK ON A PULL REQUEST**.
22+
1. **YOU MUST READ [Contributing Code](https://github.com/go-gitea/gitea/wiki/Contributing-Code) BEFORE STARTING TO WORK ON A PULL REQUEST**.
1723
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.
1824
3. The demo site [try.gogs.io](https://try.gogs.io) is running under `develop` branch.
1925
4. If you think there are vulnerabilities in the project, please talk privately to **[email protected]**. Thanks!
@@ -72,7 +78,7 @@ There are 5 ways to install Gogs:
7278
- [Install from binary](https://gogs.io/docs/installation/install_from_binary.html)
7379
- [Install from source](https://gogs.io/docs/installation/install_from_source.html)
7480
- [Install from packages](https://gogs.io/docs/installation/install_from_packages.html)
75-
- [Ship with Docker](https://github.com/gogits/gogs/tree/master/docker)
81+
- [Ship with Docker](https://github.com/go-gitea/gitea/tree/master/docker)
7682
- [Install with Vagrant](https://github.com/geerlingguy/ansible-vagrant-examples/tree/master/gogs)
7783

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

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

136142
## License
137143

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

README_ZH.md

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
1-
Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?branch=master)](https://travis-ci.org/gogits/gogs)
2-
=====================
1+
# Gitea - Git with a cup of tea
2+
3+
[![Build Status](https://travis-ci.org/go-gitea/gitea.svg?branch=master)](https://travis-ci.org/go-gitea/gitea)
4+
[![codecov](https://codecov.io/gh/go-gitea/gitea/branch/master/graph/badge.svg)](https://codecov.io/gh/go-gitea/gitea)
5+
[![Go Report Card](https://goreportcard.com/badge/github.com/go-gitea/gitea)](https://goreportcard.com/report/github.com/go-gitea/gitea)
6+
[![GoDoc](https://godoc.org/github.com/go-gitea/gitea?status.svg)](https://godoc.org/github.com/go-gitea/gitea)
7+
[![](https://images.microbadger.com/badges/image/gitea/gitea.svg)](http://microbadger.com/images/gitea/gitea "Get your own image badge on microbadger.com")
8+
[![Join the chat at https://gitter.im/go-gitea/gitea](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/go-gitea/gitea?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
39

410
Gogs (Go Git Service) 是一款极易搭建的自助 Git 服务。
511

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

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

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

105111
## 授权许可
106112

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

cmd/admin.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99

1010
"github.com/urfave/cli"
1111

12-
"github.com/gogits/gogs/models"
13-
"github.com/gogits/gogs/modules/setting"
12+
"github.com/go-gitea/gitea/models"
13+
"github.com/go-gitea/gitea/modules/setting"
1414
)
1515

1616
var (

cmd/dump.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import (
1616
"github.com/Unknwon/cae/zip"
1717
"github.com/urfave/cli"
1818

19-
"github.com/gogits/gogs/models"
20-
"github.com/gogits/gogs/modules/setting"
19+
"github.com/go-gitea/gitea/models"
20+
"github.com/go-gitea/gitea/modules/setting"
2121
)
2222

2323
var CmdDump = cli.Command{

cmd/serve.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ import (
1818
gouuid "github.com/satori/go.uuid"
1919
"github.com/urfave/cli"
2020

21-
"github.com/gogits/gogs/models"
22-
"github.com/gogits/gogs/modules/base"
23-
"github.com/gogits/gogs/modules/httplib"
24-
"github.com/gogits/gogs/modules/log"
25-
"github.com/gogits/gogs/modules/setting"
21+
"github.com/go-gitea/gitea/models"
22+
"github.com/go-gitea/gitea/modules/base"
23+
"github.com/go-gitea/gitea/modules/httplib"
24+
"github.com/go-gitea/gitea/modules/log"
25+
"github.com/go-gitea/gitea/modules/setting"
2626
)
2727

2828
const (

cmd/update.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import (
99

1010
"github.com/urfave/cli"
1111

12-
"github.com/gogits/gogs/models"
13-
"github.com/gogits/gogs/modules/log"
14-
"github.com/gogits/gogs/modules/setting"
12+
"github.com/go-gitea/gitea/models"
13+
"github.com/go-gitea/gitea/modules/log"
14+
"github.com/go-gitea/gitea/modules/setting"
1515
)
1616

1717
var CmdUpdate = cli.Command{

cmd/web.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,20 @@ import (
3232
"github.com/gogits/git-module"
3333
"github.com/gogits/go-gogs-client"
3434

35-
"github.com/gogits/gogs/models"
36-
"github.com/gogits/gogs/modules/auth"
37-
"github.com/gogits/gogs/modules/bindata"
38-
"github.com/gogits/gogs/modules/context"
39-
"github.com/gogits/gogs/modules/log"
40-
"github.com/gogits/gogs/modules/setting"
41-
"github.com/gogits/gogs/modules/template"
42-
"github.com/gogits/gogs/routers"
43-
"github.com/gogits/gogs/routers/admin"
44-
apiv1 "github.com/gogits/gogs/routers/api/v1"
45-
"github.com/gogits/gogs/routers/dev"
46-
"github.com/gogits/gogs/routers/org"
47-
"github.com/gogits/gogs/routers/repo"
48-
"github.com/gogits/gogs/routers/user"
35+
"github.com/go-gitea/gitea/models"
36+
"github.com/go-gitea/gitea/modules/auth"
37+
"github.com/go-gitea/gitea/modules/bindata"
38+
"github.com/go-gitea/gitea/modules/context"
39+
"github.com/go-gitea/gitea/modules/log"
40+
"github.com/go-gitea/gitea/modules/setting"
41+
"github.com/go-gitea/gitea/modules/template"
42+
"github.com/go-gitea/gitea/routers"
43+
"github.com/go-gitea/gitea/routers/admin"
44+
apiv1 "github.com/go-gitea/gitea/routers/api/v1"
45+
"github.com/go-gitea/gitea/routers/dev"
46+
"github.com/go-gitea/gitea/routers/org"
47+
"github.com/go-gitea/gitea/routers/repo"
48+
"github.com/go-gitea/gitea/routers/user"
4949
)
5050

5151
var CmdWeb = cli.Command{

conf/app.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ DISABLE_REGISTRATION = false
179179
REQUIRE_SIGNIN_VIEW = false
180180
; Mail notification
181181
ENABLE_NOTIFY_MAIL = false
182-
; More detail: https://github.com/gogits/gogs/issues/165
182+
; More detail: https://github.com/go-gitea/gitea/issues/165
183183
ENABLE_REVERSE_PROXY_AUTHENTICATION = false
184184
ENABLE_REVERSE_PROXY_AUTO_REGISTRATION = false
185185
; Enable captcha validation for registration

docker/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ go install
2020

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

glide.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

glide.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package: github.com/gogits/gogs
1+
package: github.com/go-gitea/gitea
22
import:
33
- package: github.com/Unknwon/cae
44
subpackages:
@@ -40,7 +40,7 @@ import:
4040
- package: github.com/sergi/go-diff
4141
subpackages:
4242
- diffmatchpatch
43-
- package: github.com/strk/go-libravatar
43+
- package: strk.kbt.io/projects/go/libravatar
4444
- package: golang.org/x/crypto
4545
subpackages:
4646
- ssh

gogs.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import (
1313

1414
"github.com/urfave/cli"
1515

16-
"github.com/gogits/gogs/cmd"
17-
"github.com/gogits/gogs/modules/setting"
16+
"github.com/go-gitea/gitea/cmd"
17+
"github.com/go-gitea/gitea/modules/setting"
1818
)
1919

2020
const APP_VER = "0.9.99.0915"

models/access.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package models
77
import (
88
"fmt"
99

10-
"github.com/gogits/gogs/modules/log"
10+
"github.com/go-gitea/gitea/modules/log"
1111
)
1212

1313
type AccessMode int

models/action.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ import (
1919
"github.com/gogits/git-module"
2020
api "github.com/gogits/go-gogs-client"
2121

22-
"github.com/gogits/gogs/modules/base"
23-
"github.com/gogits/gogs/modules/log"
24-
"github.com/gogits/gogs/modules/setting"
22+
"github.com/go-gitea/gitea/modules/base"
23+
"github.com/go-gitea/gitea/modules/log"
24+
"github.com/go-gitea/gitea/modules/setting"
2525
)
2626

2727
type ActionType int

models/admin.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import (
1414
"github.com/Unknwon/com"
1515
"github.com/go-xorm/xorm"
1616

17-
"github.com/gogits/gogs/modules/base"
18-
"github.com/gogits/gogs/modules/log"
19-
"github.com/gogits/gogs/modules/setting"
17+
"github.com/go-gitea/gitea/modules/base"
18+
"github.com/go-gitea/gitea/modules/log"
19+
"github.com/go-gitea/gitea/modules/setting"
2020
)
2121

2222
type NoticeType int

models/git_diff.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ import (
2323

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

26-
"github.com/gogits/gogs/modules/base"
27-
"github.com/gogits/gogs/modules/log"
28-
"github.com/gogits/gogs/modules/process"
29-
"github.com/gogits/gogs/modules/setting"
30-
"github.com/gogits/gogs/modules/template/highlight"
26+
"github.com/go-gitea/gitea/modules/base"
27+
"github.com/go-gitea/gitea/modules/log"
28+
"github.com/go-gitea/gitea/modules/process"
29+
"github.com/go-gitea/gitea/modules/setting"
30+
"github.com/go-gitea/gitea/modules/template/highlight"
3131
)
3232

3333
type DiffLineType uint8

0 commit comments

Comments
 (0)