diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index bd4ff08745..5e98bc2e40 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 b1cf1a4eca..23a7bfeb40 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 0b1b7cc52e..45eb20f2e4 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 @@ -35,7 +35,7 @@ github.com/nfnt/resize = commit:891127d github.com/russross/blackfriday = commit:93622da github.com/satori/go.uuid = commit:0aa62d5 github.com/sergi/go-diff = commit:ec7fdbb -github.com/strk/go-libravatar = commit:5eed7bf +strk.kbt.io/projects/go/libravatar = commit:5eed7bf github.com/shurcooL/sanitized_anchor_name = commit:10ef21a github.com/Unknwon/cae = commit:7f5e046 github.com/Unknwon/com = commit:28b053d diff --git a/.lgtm b/.lgtm new file mode 100644 index 0000000000..79f20258f9 --- /dev/null +++ b/.lgtm @@ -0,0 +1 @@ +self_approval_off = false diff --git a/.travis.yml b/.travis.yml index 82387935a7..77093af494 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,30 +1,34 @@ language: go go: - - 1.4 - - 1.5 - 1.6 - 1.7 before_install: - sudo apt-get update -qq - sudo apt-get install -y libpam-dev - - go get github.com/msteinert/pam + - go get github.com/msteinert/pam install: - go get -t -v ./... -script: - - go build -v -tags "pam" - - go test -v -cover -race ./... +script: | + go build -v -tags "pam" + + for pkg in $(go list ./... | grep -v /vendor/) + do + go test -v -race -cover -coverprofile $GOPATH/src/$pkg/coverage.out $pkg || exit 1 + done + +after_success: + - bash <(curl -s https://codecov.io/bash) notifications: - email: - - u@gogs.io - slack: gophercn:o5pSanyTeNhnfYc3QnG0X7Wx webhooks: + on_success: change + on_failure: always + on_start: never urls: - - https://webhooks.gitter.im/e/b590f8e03882f7aedc3e - on_success: change - on_failure: always - on_start: never + - https://webhooks.gitter.im/e/ee6b822f3cf54c98e70c + - https://webhooks.gitter.im/e/87428658ef177ce8a7e4 + - https://webhooks.gitter.im/e/a1d2b69804dfda72187e diff --git a/Makefile b/Makefile index c321f82bad..b3ee101959 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 e465972dff..bfd30ba006 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,15 @@ -Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?branch=master)](https://travis-ci.org/gogits/gogs) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/gogs/localized.svg)](https://crowdin.com/project/gogs) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/gogits/gogs?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) -===================== +# Gitea - Git with a cup of tea -![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true) +[![Build Status](https://travis-ci.org/go-gitea/gitea.svg?branch=master)](https://travis-ci.org/go-gitea/gitea) +[![codecov](https://codecov.io/gh/go-gitea/gitea/branch/master/graph/badge.svg)](https://codecov.io/gh/go-gitea/gitea) +[![Go Report Card](https://goreportcard.com/badge/github.com/go-gitea/gitea)](https://goreportcard.com/report/github.com/go-gitea/gitea) +[![GoDoc](https://godoc.org/github.com/go-gitea/gitea?status.svg)](https://godoc.org/github.com/go-gitea/gitea) +[![](https://images.microbadger.com/badges/image/gitea/gitea.svg)](http://microbadger.com/images/gitea/gitea "Get your own image badge on microbadger.com") +[![Join the chat at https://gitter.im/go-gitea/gitea](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/go-gitea/gitea?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) -##### Current tip version: 0.9.99 (see [Releases](https://github.com/gogits/gogs/releases) for binary versions or submit a task on [alpha stage automated binary building system](https://build.gogs.io/)) +![](https://github.com/go-gitea/gitea/blob/master/public/img/gogs-large-resize.png?raw=true) + +##### Current tip version: 0.9.99 (see [Releases](https://github.com/go-gitea/gitea/releases) for binary versions or submit a task on [alpha stage automated binary building system](https://build.gogs.io/)) | Web | UI | Preview | |:-------------:|:-------:|:-------:| @@ -13,7 +19,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 +78,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 +136,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 077cf86d5c..bd61851dff 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -1,5 +1,11 @@ -Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?branch=master)](https://travis-ci.org/gogits/gogs) -===================== +# Gitea - Git with a cup of tea + +[![Build Status](https://travis-ci.org/go-gitea/gitea.svg?branch=master)](https://travis-ci.org/go-gitea/gitea) +[![codecov](https://codecov.io/gh/go-gitea/gitea/branch/master/graph/badge.svg)](https://codecov.io/gh/go-gitea/gitea) +[![Go Report Card](https://goreportcard.com/badge/github.com/go-gitea/gitea)](https://goreportcard.com/report/github.com/go-gitea/gitea) +[![GoDoc](https://godoc.org/github.com/go-gitea/gitea?status.svg)](https://godoc.org/github.com/go-gitea/gitea) +[![](https://images.microbadger.com/badges/image/gitea/gitea.svg)](http://microbadger.com/images/gitea/gitea "Get your own image badge on microbadger.com") +[![Join the chat at https://gitter.im/go-gitea/gitea](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/go-gitea/gitea?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) Gogs (Go Git Service) 是一款极易搭建的自助 Git 服务。 @@ -53,7 +59,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 +105,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 bad36b1c85..a10e0e5fe5 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 c1361f9328..1e03ef74f0 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 53d33b2edd..051e215db1 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 bebc101609..450d18a08a 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 a3a214e19d..d5dae5badc 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 8110ac851d..0f6163c4f4 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 da36d7e6e0..fb98b12b87 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.lock b/glide.lock index 0d280df273..e31fc6d651 100644 --- a/glide.lock +++ b/glide.lock @@ -81,7 +81,7 @@ imports: version: ec7fdbb58eb3e300c8595ad5ac74a5aa50019cc7 subpackages: - diffmatchpatch -- name: github.com/strk/go-libravatar +- name: strk.kbt.io/projects/go/libravatar version: 5eed7bff870ae19ef51c5773dbc8f3e9fcbd0982 - name: github.com/shurcooL/sanitized_anchor_name version: 10ef21a441db47d8b13ebcc5fd2310f636973c77 diff --git a/glide.yaml b/glide.yaml index 1d4734eb55..1de38e02d1 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: @@ -40,7 +40,7 @@ import: - package: github.com/sergi/go-diff subpackages: - diffmatchpatch -- package: github.com/strk/go-libravatar +- package: strk.kbt.io/projects/go/libravatar - package: golang.org/x/crypto subpackages: - ssh diff --git a/gogs.go b/gogs.go index 2cabeeda78..0235a20883 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 b3be9b5bb6..e46819f2d4 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 54695417a7..d47ba87d7f 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 68731a2433..3f17c2fdaa 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 107f630ff9..e3d5df2648 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 208204b076..be9eedcd2b 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 ccfa765f92..1c615ab511 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 13bf2005f3..0b9644c249 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 02548bc3ed..8a4945c645 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 584f3f9bc9..c9a0c73764 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 0db21355a8..df5fd789bc 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 ( @@ -160,7 +160,7 @@ func composeIssueMessage(issue *Issue, doer *User, tplName base.TplName, tos []s if err != nil { log.Error(3, "HTMLString (%s): %v", tplName, err) } - msg := mailer.NewMessageFrom(tos, fmt.Sprintf(`"%s" <%s>`, doer.DisplayName(), setting.MailService.User), subject, content) + msg := mailer.NewMessageFrom(tos, fmt.Sprintf(`"%s" <%s>`, doer.DisplayName(), setting.MailService.FromEmail), subject, content) msg.Info = fmt.Sprintf("Subject: %s, %s", subject, info) return msg } diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index edd07a66ec..66e5d831e8 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 0cf422a9a1..a9da884624 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 706b188979..1fd6039b6d 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 100d4db435..f582adccb0 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 c79ff222e5..2fd47813d1 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 010c9fad60..7c4e475dda 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 dfdb864a1c..33d69e35b2 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 8835c40d2f..9688f579ab 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 69d90b938f..9ab27ba619 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 0925b9ba76..77adce9f3b 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 1cda60c508..e748f381c3 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 2c1f64ce03..5d9053cc20 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 79d62c8f6a..80d222c5d3 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 946c6c94d4..32242e0ea6 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 084a7ee73f..534e69135b 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 edc26a78f3..9cfbaf25c2 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 bc8aaf666e..f4bf7a3b7f 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 3265b326c6..c19bffe710 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 55364bfcce..b110fe6234 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 d1e28dc119..589997f151 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 52d1e178db..8cc90c0b9a 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 770daa3ad3..62be56d320 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 ecf60a1905..c0cdf7b3ab 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 746771791e..807183e452 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 ac46bb38fb..82e3cbf27b 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 24ef5ef6a8..880554a4b1 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 f078523e75..e4c2c597c5 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 7695b974bb..d0c769ca99 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 32f25f5b57..098e136721 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 6724b248ad..100a4df10f 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 d4071ba356..9de8f11dc4 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 1f98ca7cfb..b259a27783 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 cff3e7dbc2..102d758dd6 100644 --- a/modules/setting/setting.go +++ b/modules/setting/setting.go @@ -6,6 +6,7 @@ package setting import ( "fmt" + "net/mail" "net/url" "os" "os/exec" @@ -21,12 +22,12 @@ import ( _ "github.com/go-macaron/cache/redis" "github.com/go-macaron/session" _ "github.com/go-macaron/session/redis" - "github.com/strk/go-libravatar" + "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 @@ -714,6 +715,7 @@ type Mailer struct { Name string Host string From string + FromEmail string User, Passwd string DisableHelo bool HeloHostname string @@ -749,6 +751,13 @@ func newMailService() { EnableHTMLAlternative: sec.Key("ENABLE_HTML_ALTERNATIVE").MustBool(), } MailService.From = sec.Key("FROM").MustString(MailService.User) + + parsed, err := mail.ParseAddress(MailService.From) + if err != nil { + log.Fatal(4, "Invalid mailer.FROM (%s): %v", MailService.From, err) + } + MailService.FromEmail = parsed.Address + log.Info("Mail Service Enabled") } diff --git a/modules/ssh/ssh.go b/modules/ssh/ssh.go index ceecc9bbfc..b6dc1d15a4 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 bbf08e0436..360ab6a73e 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 3a6eb042bb..3fe49fa380 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/public/css/gogs.css b/public/css/gogs.css index 3832c30f83..e4638bb069 100644 --- a/public/css/gogs.css +++ b/public/css/gogs.css @@ -31,18 +31,23 @@ pre.wrap, code.wrap { white-space: pre-wrap; /* CSS 3 */ + word-break: break-word; } .dont-break-out { /* These are technically the same, but use both */ + overflow-wrap: break-word; word-wrap: break-word; -ms-word-break: break-all; /* This is the dangerous one in WebKit, as it breaks things wherever */ + word-break: break-all; /* Instead use this non-standard one: */ + word-break: break-word; /* Adds a hyphen where the word breaks, if supported (No Blink) */ + -ms-hyphens: auto; -moz-hyphens: auto; -webkit-hyphens: auto; @@ -812,7 +817,7 @@ footer .ui.language .menu { border: solid 1px #ccc; border-bottom-color: #bbb; border-radius: 3px; - box-shadow: inset 0 -1px 0 #bbb; + box-shadow: inset 0 -1px 0 #bbbbbb; } .markdown:not(code) input[type="checkbox"] { vertical-align: middle !important; @@ -883,7 +888,7 @@ footer .ui.language .menu { } .install form label { text-align: right; - width: 320px !important; + width: 320px; } .install form input { width: 35% !important; @@ -892,7 +897,7 @@ footer .ui.language .menu { text-align: left; } .install form .field .help { - margin-left: 335px !important; + margin-left: 335px; } .install form .field.optional .title { margin-left: 38%; @@ -927,18 +932,18 @@ footer .ui.language .menu { text-align: center; } #create-page-form form .header { - padding-left: 280px !important; + padding-left: 280px; } #create-page-form form .inline.field > label { text-align: right; - width: 250px !important; + width: 250px; word-wrap: break-word; } #create-page-form form .help { - margin-left: 265px !important; + margin-left: 265px; } #create-page-form form .optional .title { - margin-left: 250px !important; + margin-left: 250px; } #create-page-form form input, #create-page-form form textarea { @@ -964,7 +969,7 @@ footer .ui.language .menu { .user.reset.password form .header, .user.signin form .header, .user.signup form .header { - padding-left: 280px !important; + padding-left: 280px; } .user.activate form .inline.field > label, .user.forgot.password form .inline.field > label, @@ -972,7 +977,7 @@ footer .ui.language .menu { .user.signin form .inline.field > label, .user.signup form .inline.field > label { text-align: right; - width: 250px !important; + width: 250px; word-wrap: break-word; } .user.activate form .help, @@ -980,14 +985,14 @@ footer .ui.language .menu { .user.reset.password form .help, .user.signin form .help, .user.signup form .help { - margin-left: 265px !important; + margin-left: 265px; } .user.activate form .optional .title, .user.forgot.password form .optional .title, .user.reset.password form .optional .title, .user.signin form .optional .title, .user.signup form .optional .title { - margin-left: 250px !important; + margin-left: 250px; } .user.activate form input, .user.forgot.password form input, @@ -1013,14 +1018,15 @@ footer .ui.language .menu { .user.reset.password form .header, .user.signin form .header, .user.signup form .header { - padding-left: 230px !important; + padding-left: 0 !important; + text-align: center; } .user.activate form .inline.field > label, .user.forgot.password form .inline.field > label, .user.reset.password form .inline.field > label, .user.signin form .inline.field > label, .user.signup form .inline.field > label { - width: 200px !important; + width: 200px; } .repository.new.repo form, .repository.new.migrate form, @@ -1036,24 +1042,24 @@ footer .ui.language .menu { .repository.new.repo form .header, .repository.new.migrate form .header, .repository.new.fork form .header { - padding-left: 280px !important; + padding-left: 280px; } .repository.new.repo form .inline.field > label, .repository.new.migrate form .inline.field > label, .repository.new.fork form .inline.field > label { text-align: right; - width: 250px !important; + width: 250px; word-wrap: break-word; } .repository.new.repo form .help, .repository.new.migrate form .help, .repository.new.fork form .help { - margin-left: 265px !important; + margin-left: 265px; } .repository.new.repo form .optional .title, .repository.new.migrate form .optional .title, .repository.new.fork form .optional .title { - margin-left: 250px !important; + margin-left: 250px; } .repository.new.repo form input, .repository.new.migrate form input, @@ -1078,11 +1084,17 @@ footer .ui.language .menu { .repository.new.fork form .dropdown .text i { margin-right: 0!important; } +.repository.new.repo form .header, +.repository.new.migrate form .header, +.repository.new.fork form .header { + padding-left: 0 !important; + text-align: center; +} .repository.new.repo .ui.form .selection.dropdown:not(.owner) { width: 50%!important; } .repository.new.repo .ui.form #auto-init { - margin-left: 265px !important; + margin-left: 265px; } .new.webhook form .help { margin-left: 25px; @@ -2328,14 +2340,18 @@ footer .ui.language .menu { } .settings .hook.list .item a { /* These are technically the same, but use both */ + overflow-wrap: break-word; word-wrap: break-word; -ms-word-break: break-all; /* This is the dangerous one in WebKit, as it breaks things wherever */ + word-break: break-all; /* Instead use this non-standard one: */ + word-break: break-word; /* Adds a hyphen where the word breaks, if supported (No Blink) */ + -ms-hyphens: auto; -moz-hyphens: auto; -webkit-hyphens: auto; @@ -2534,23 +2550,27 @@ footer .ui.language .menu { text-align: center; } .organization.new.org form .header { - padding-left: 280px !important; + padding-left: 280px; } .organization.new.org form .inline.field > label { text-align: right; - width: 250px !important; + width: 250px; word-wrap: break-word; } .organization.new.org form .help { - margin-left: 265px !important; + margin-left: 265px; } .organization.new.org form .optional .title { - margin-left: 250px !important; + margin-left: 250px; } .organization.new.org form input, .organization.new.org form textarea { width: 50%!important; } +.organization.new.org form .header { + padding-left: 0 !important; + text-align: center; +} .organization.options input { min-width: 300px; } diff --git a/public/less/_form.less b/public/less/_form.less index 3dba34d7ec..1fe48d97ac 100644 --- a/public/less/_form.less +++ b/public/less/_form.less @@ -1,9 +1,9 @@ .form { .help { color: #999999; - padding-top: .6em; - padding-bottom: .6em; - display: inline-block; + padding-top: .6em; + padding-bottom: .6em; + display: inline-block; } } .ui.attached.header { @@ -56,7 +56,8 @@ form { width: 700px!important; .header { - padding-left: @input-padding+30px; + padding-left: 0 !important; + text-align: center; } .inline.field > label { width: @input-padding; @@ -81,6 +82,10 @@ } } } + .header { + padding-left: 0 !important; + text-align: center; + } } } diff --git a/public/less/_organization.less b/public/less/_organization.less index 664c464274..b02e43b644 100644 --- a/public/less/_organization.less +++ b/public/less/_organization.less @@ -17,6 +17,12 @@ &.new.org { #create-page-form; + form { + .header { + padding-left: 0 !important; + text-align: center; + } + } } &.options { diff --git a/routers/admin/admin.go b/routers/admin/admin.go index 1b22251e55..843860306b 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 df2512aa06..dcd9a225a7 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 5d4e807ee4..80b7aa2945 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 3200072107..efda1e5165 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 5eacb5ed38..2c32070ed3 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 eb91ea2fdf..0eaa3c995c 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 e82fc3ed66..5e594e1e5f 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 71c84ad0ef..01835fa2ab 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 c0f3487e11..7a28d9566e 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 0f0c3862de..e673447c4b 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 6d38dee128..b25c687d2f 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 0591cddb86..2d468eae5f 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 fcadb51fd4..49c1941a46 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 f34fb3d2b6..0062157c84 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 64895db072..8ca5cde953 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 7b2cfcd1dc..3f26f5510d 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 70f8d84206..0c87ce26b9 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 a141921eac..f4327378dc 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 e14875cbec..cfb2118905 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 ee9d15a322..0dabea8b96 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 3b36055db5..315172199b 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 fe967ae0a5..9193c02106 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 3957600b7b..71ce19fe33 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 f1eed2112a..0d520a4f93 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 563dac2615..ec60bc516b 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 705206cef7..efa68b0a1d 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 652ccbb5c6..8913190f6d 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 cc75f5bf4e..e6890ca33d 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 165f6eb8ec..90b571dbba 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 1f615cdff3..1643f2b0ae 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 58a162444b..0f0e7fcec3 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 3e407feff8..ba4c1e1ee1 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 b526af5da7..6258662b68 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 ee81f3804a..515b2e3bd1 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 22a131a626..10e75269b8 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 651f2f2f5d..0118791635 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 15998aa274..e3aab7481e 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 1a7800d955..156ccb3ee6 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 14681e4c59..2169779232 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 3d0456423a..c6636aa836 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 00f30b0f13..139b3fb237 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 b9ced49ed2..a8e96f0e5e 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 faa30ac9d7..c1f8142cd8 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 428a25d568..641cadcb92 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 80afcec410..a97593f26e 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 21d4c7d964..76d81d0e76 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 d5d9bc9b07..d345dbee06 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 d612a1cec5..9d87f0967e 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 74ee3c4ff8..6816124721 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 80b44ad220..4bcc470e99 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 c04ef1ee3f..3bb551f2e0 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 d3605b2a42..0c2f7c383e 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 a20bea25df..4043a96bee 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 7117f1ec7f..b50a360561 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 83b4b26166..fb079546e7 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 363705dd01..6c3f51a9da 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 10e8fd02b6..35763ab48d 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 51531fb79d..39323521aa 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 3f0190528d..7b5398633d 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 8272db20c8..4ed06d3a7c 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 c8c2cbd05a..2f1de90d8e 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 776f4fb78e..fa3d340dd5 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" .}}