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

.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
 

.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.
 

.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

.lgtm

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

.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: 
+script: |
-  - go build -v -tags "pam"
+  go build -v -tags "pam"
-  - go test -v -cover -race ./...
+
+  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
+      - https://webhooks.gitter.im/e/ee6b822f3cf54c98e70c
-    on_success: change 
+      - https://webhooks.gitter.im/e/87428658ef177ce8a7e4
-    on_failure: always 
+      - https://webhooks.gitter.im/e/a1d2b69804dfda72187e
-    on_start: never     

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/go-gitea/gitea/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.BuildGitHash=$(shell git rev-parse HEAD)"
 
 DATA_FILES := $(shell find conf | sed 's/ /\\ /g')
 LESS_FILES := $(wildcard public/less/gogs.less public/less/_*.less)

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.

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) 文件中。

cmd/admin.go

@@ -9,8 +9,8 @@ import (
 
 	"github.com/urfave/cli"
 
-	"github.com/gogits/gogs/models"
+	"github.com/go-gitea/gitea/models"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/go-gitea/gitea/modules/setting"
 )
 
 var (

cmd/dump.go

@@ -16,8 +16,8 @@ import (
 	"github.com/Unknwon/cae/zip"
 	"github.com/urfave/cli"
 
-	"github.com/gogits/gogs/models"
+	"github.com/go-gitea/gitea/models"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/go-gitea/gitea/modules/setting"
 )
 
 var CmdDump = cli.Command{

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/go-gitea/gitea/models"
-	"github.com/gogits/gogs/modules/base"
+	"github.com/go-gitea/gitea/modules/base"
-	"github.com/gogits/gogs/modules/httplib"
+	"github.com/go-gitea/gitea/modules/httplib"
-	"github.com/gogits/gogs/modules/log"
+	"github.com/go-gitea/gitea/modules/log"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/go-gitea/gitea/modules/setting"
 )
 
 const (

cmd/update.go

@@ -9,9 +9,9 @@ import (
 
 	"github.com/urfave/cli"
 
-	"github.com/gogits/gogs/models"
+	"github.com/go-gitea/gitea/models"
-	"github.com/gogits/gogs/modules/log"
+	"github.com/go-gitea/gitea/modules/log"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/go-gitea/gitea/modules/setting"
 )
 
 var CmdUpdate = cli.Command{

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/go-gitea/gitea/models"
-	"github.com/gogits/gogs/modules/auth"
+	"github.com/go-gitea/gitea/modules/auth"
-	"github.com/gogits/gogs/modules/bindata"
+	"github.com/go-gitea/gitea/modules/bindata"
-	"github.com/gogits/gogs/modules/context"
+	"github.com/go-gitea/gitea/modules/context"
-	"github.com/gogits/gogs/modules/log"
+	"github.com/go-gitea/gitea/modules/log"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/go-gitea/gitea/modules/setting"
-	"github.com/gogits/gogs/modules/template"
+	"github.com/go-gitea/gitea/modules/template"
-	"github.com/gogits/gogs/routers"
+	"github.com/go-gitea/gitea/routers"
-	"github.com/gogits/gogs/routers/admin"
+	"github.com/go-gitea/gitea/routers/admin"
-	apiv1 "github.com/gogits/gogs/routers/api/v1"
+	apiv1 "github.com/go-gitea/gitea/routers/api/v1"
-	"github.com/gogits/gogs/routers/dev"
+	"github.com/go-gitea/gitea/routers/dev"
-	"github.com/gogits/gogs/routers/org"
+	"github.com/go-gitea/gitea/routers/org"
-	"github.com/gogits/gogs/routers/repo"
+	"github.com/go-gitea/gitea/routers/repo"
-	"github.com/gogits/gogs/routers/user"
+	"github.com/go-gitea/gitea/routers/user"
 )
 
 var CmdWeb = cli.Command{

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

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
+ln -s /app/gogs/ ${GOPATH}/src/github.com/go-gitea/gitea
-cd ${GOPATH}/src/github.com/gogits/gogs
+cd ${GOPATH}/src/github.com/go-gitea/gitea
 glide install
 make build TAGS="sqlite cert pam"
 

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

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

gogs.go

@@ -13,8 +13,8 @@ import (
 
 	"github.com/urfave/cli"
 
-	"github.com/gogits/gogs/cmd"
+	"github.com/go-gitea/gitea/cmd"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/go-gitea/gitea/modules/setting"
 )
 
 const APP_VER = "0.9.99.0915"

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

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/go-gitea/gitea/modules/base"
-	"github.com/gogits/gogs/modules/log"
+	"github.com/go-gitea/gitea/modules/log"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/go-gitea/gitea/modules/setting"
 )
 
 type ActionType int

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/go-gitea/gitea/modules/base"
-	"github.com/gogits/gogs/modules/log"
+	"github.com/go-gitea/gitea/modules/log"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/go-gitea/gitea/modules/setting"
 )
 
 type NoticeType int

models/git_diff.go

@@ -23,11 +23,11 @@ import (
 
 	"github.com/gogits/git-module"
 
-	"github.com/gogits/gogs/modules/base"
+	"github.com/go-gitea/gitea/modules/base"
-	"github.com/gogits/gogs/modules/log"
+	"github.com/go-gitea/gitea/modules/log"
-	"github.com/gogits/gogs/modules/process"
+	"github.com/go-gitea/gitea/modules/process"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/go-gitea/gitea/modules/setting"
-	"github.com/gogits/gogs/modules/template/highlight"
+	"github.com/go-gitea/gitea/modules/template/highlight"
 )
 
 type DiffLineType uint8

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/go-gitea/gitea/modules/base"
-	"github.com/gogits/gogs/modules/log"
+	"github.com/go-gitea/gitea/modules/log"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/go-gitea/gitea/modules/setting"
 )
 
 var (

models/issue_comment.go

@@ -14,8 +14,8 @@ import (
 
 	api "github.com/gogits/go-gogs-client"
 
-	"github.com/gogits/gogs/modules/log"
+	"github.com/go-gitea/gitea/modules/log"
-	"github.com/gogits/gogs/modules/markdown"
+	"github.com/go-gitea/gitea/modules/markdown"
 )
 
 // CommentType defines whether a comment is just a simple comment, an action (like close) or a reference.

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})")

models/issue_mail.go

@@ -9,9 +9,9 @@ import (
 
 	"github.com/Unknwon/com"
 
-	"github.com/gogits/gogs/modules/log"
+	"github.com/go-gitea/gitea/modules/log"
-	"github.com/gogits/gogs/modules/markdown"
+	"github.com/go-gitea/gitea/modules/markdown"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/go-gitea/gitea/modules/setting"
 )
 
 func (issue *Issue) MailSubject() string {

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/go-gitea/gitea/modules/auth/ldap"
-	"github.com/gogits/gogs/modules/auth/pam"
+	"github.com/go-gitea/gitea/modules/auth/pam"
-	"github.com/gogits/gogs/modules/log"
+	"github.com/go-gitea/gitea/modules/log"
 )
 
 type LoginType int

models/mail.go

@@ -12,11 +12,11 @@ import (
 	"gopkg.in/gomail.v2"
 	"gopkg.in/macaron.v1"
 
-	"github.com/gogits/gogs/modules/base"
+	"github.com/go-gitea/gitea/modules/base"
-	"github.com/gogits/gogs/modules/log"
+	"github.com/go-gitea/gitea/modules/log"
-	"github.com/gogits/gogs/modules/mailer"
+	"github.com/go-gitea/gitea/modules/mailer"
-	"github.com/gogits/gogs/modules/markdown"
+	"github.com/go-gitea/gitea/modules/markdown"
-	"github.com/gogits/gogs/modules/setting"
+	"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
 }

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/go-gitea/gitea/modules/base"
-	"github.com/gogits/gogs/modules/log"
+	"github.com/go-gitea/gitea/modules/log"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/go-gitea/gitea/modules/setting"
 )
 
 const _MIN_DB_VER = 4

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/go-gitea/gitea/models/migrations"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/go-gitea/gitea/modules/setting"
 )
 
 // Engine represents a xorm engine or session.

models/org.go

@@ -12,8 +12,8 @@ import (
 
 	"github.com/go-xorm/xorm"
 
-	"github.com/gogits/gogs/modules/base"
+	"github.com/go-gitea/gitea/modules/base"
-	"github.com/gogits/gogs/modules/log"
+	"github.com/go-gitea/gitea/modules/log"
 )
 
 var (

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/go-gitea/gitea/modules/log"
-	"github.com/gogits/gogs/modules/process"
+	"github.com/go-gitea/gitea/modules/process"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/go-gitea/gitea/modules/setting"
-	"github.com/gogits/gogs/modules/sync"
+	"github.com/go-gitea/gitea/modules/sync"
 )
 
 var PullRequestQueue = sync.NewUniqueQueue(setting.Repository.PullRequestQueueLength)

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.

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/go-gitea/gitea/modules/bindata"
-	"github.com/gogits/gogs/modules/log"
+	"github.com/go-gitea/gitea/modules/log"
-	"github.com/gogits/gogs/modules/markdown"
+	"github.com/go-gitea/gitea/modules/markdown"
-	"github.com/gogits/gogs/modules/process"
+	"github.com/go-gitea/gitea/modules/process"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/go-gitea/gitea/modules/setting"
-	"github.com/gogits/gogs/modules/sync"
+	"github.com/go-gitea/gitea/modules/sync"
 )
 
 const (

models/repo_editor.go

@@ -20,9 +20,9 @@ import (
 
 	git "github.com/gogits/git-module"
 
-	"github.com/gogits/gogs/modules/log"
+	"github.com/go-gitea/gitea/modules/log"
-	"github.com/gogits/gogs/modules/process"
+	"github.com/go-gitea/gitea/modules/process"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/go-gitea/gitea/modules/setting"
 )
 
 // ___________    .___.__  __    ___________.__.__

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/go-gitea/gitea/modules/log"
-	"github.com/gogits/gogs/modules/process"
+	"github.com/go-gitea/gitea/modules/process"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/go-gitea/gitea/modules/setting"
-	"github.com/gogits/gogs/modules/sync"
+	"github.com/go-gitea/gitea/modules/sync"
 )
 
 var MirrorQueue = sync.NewUniqueQueue(setting.Repository.MirrorQueueLength)

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) {

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/go-gitea/gitea/modules/base"
-	"github.com/gogits/gogs/modules/log"
+	"github.com/go-gitea/gitea/modules/log"
-	"github.com/gogits/gogs/modules/process"
+	"github.com/go-gitea/gitea/modules/process"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/go-gitea/gitea/modules/setting"
 )
 
 const (

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() {

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.

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 {

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/go-gitea/gitea/modules/avatar"
-	"github.com/gogits/gogs/modules/base"
+	"github.com/go-gitea/gitea/modules/base"
-	"github.com/gogits/gogs/modules/log"
+	"github.com/go-gitea/gitea/modules/log"
-	"github.com/gogits/gogs/modules/markdown"
+	"github.com/go-gitea/gitea/modules/markdown"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/go-gitea/gitea/modules/setting"
 )
 
 type UserType int

models/webhook.go

@@ -17,10 +17,10 @@ import (
 
 	api "github.com/gogits/go-gogs-client"
 
-	"github.com/gogits/gogs/modules/httplib"
+	"github.com/go-gitea/gitea/modules/httplib"
-	"github.com/gogits/gogs/modules/log"
+	"github.com/go-gitea/gitea/modules/log"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/go-gitea/gitea/modules/setting"
-	"github.com/gogits/gogs/modules/sync"
+	"github.com/go-gitea/gitea/modules/sync"
 )
 
 var HookQueue = sync.NewUniqueQueue(setting.Webhook.QueueLength)

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 {

models/wiki.go

@@ -17,8 +17,8 @@ import (
 
 	"github.com/gogits/git-module"
 
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/go-gitea/gitea/modules/setting"
-	"github.com/gogits/gogs/modules/sync"
+	"github.com/go-gitea/gitea/modules/sync"
 )
 
 var wikiWorkingPool = sync.NewExclusivePool()

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/go-gitea/gitea/models"
-	"github.com/gogits/gogs/modules/base"
+	"github.com/go-gitea/gitea/modules/base"
-	"github.com/gogits/gogs/modules/log"
+	"github.com/go-gitea/gitea/modules/log"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/go-gitea/gitea/modules/setting"
 )
 
 func IsAPIPath(url string) bool {

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

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"
 )
 
 // _______________________________________    _________.______________________ _______________.___.

modules/base/tool.go

@@ -26,8 +26,8 @@ import (
 
 	"github.com/gogits/chardet"
 
-	"github.com/gogits/gogs/modules/log"
+	"github.com/go-gitea/gitea/modules/log"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/go-gitea/gitea/modules/setting"
 )
 
 // EncodeMD5 encodes string to md5 hex value.

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/go-gitea/gitea/modules/base"
-	"github.com/gogits/gogs/modules/log"
+	"github.com/go-gitea/gitea/modules/log"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/go-gitea/gitea/modules/setting"
 )
 
 type APIContext struct {

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 {

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/go-gitea/gitea/modules/auth"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/go-gitea/gitea/modules/setting"
 )
 
 type ToggleOptions struct {

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/go-gitea/gitea/models"
-	"github.com/gogits/gogs/modules/auth"
+	"github.com/go-gitea/gitea/modules/auth"
-	"github.com/gogits/gogs/modules/base"
+	"github.com/go-gitea/gitea/modules/base"
-	"github.com/gogits/gogs/modules/log"
+	"github.com/go-gitea/gitea/modules/log"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/go-gitea/gitea/modules/setting"
 )
 
 // Context represents context of a request.

modules/context/org.go

@@ -9,8 +9,8 @@ import (
 
 	"gopkg.in/macaron.v1"
 
-	"github.com/gogits/gogs/models"
+	"github.com/go-gitea/gitea/models"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/go-gitea/gitea/modules/setting"
 )
 
 type Organization struct {

modules/context/repo.go

@@ -16,9 +16,9 @@ import (
 
 	"github.com/gogits/git-module"
 
-	"github.com/gogits/gogs/models"
+	"github.com/go-gitea/gitea/models"
-	"github.com/gogits/gogs/modules/log"
+	"github.com/go-gitea/gitea/modules/log"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/go-gitea/gitea/modules/setting"
 )
 
 type PullRequest struct {

modules/cron/cron.go

@@ -9,9 +9,9 @@ import (
 
 	"github.com/gogits/cron"
 
-	"github.com/gogits/gogs/models"
+	"github.com/go-gitea/gitea/models"
-	"github.com/gogits/gogs/modules/log"
+	"github.com/go-gitea/gitea/modules/log"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/go-gitea/gitea/modules/setting"
 )
 
 var c = cron.New()

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/go-gitea/gitea/modules/log"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/go-gitea/gitea/modules/setting"
 )
 
 type Message struct {

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/go-gitea/gitea/modules/base"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/go-gitea/gitea/modules/setting"
 )
 
 const (

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"
 )
 

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 (

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/go-gitea/gitea/modules/bindata"
-	"github.com/gogits/gogs/modules/log"
+	"github.com/go-gitea/gitea/modules/log"
-	"github.com/gogits/gogs/modules/user"
+	"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")
 }
 

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/go-gitea/gitea/models"
-	"github.com/gogits/gogs/modules/log"
+	"github.com/go-gitea/gitea/modules/log"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/go-gitea/gitea/modules/setting"
 )
 
 func cleanCommand(cmd string) string {

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 (

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/go-gitea/gitea/models"
-	"github.com/gogits/gogs/modules/base"
+	"github.com/go-gitea/gitea/modules/base"
-	"github.com/gogits/gogs/modules/log"
+	"github.com/go-gitea/gitea/modules/log"
-	"github.com/gogits/gogs/modules/markdown"
+	"github.com/go-gitea/gitea/modules/markdown"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/go-gitea/gitea/modules/setting"
 )
 
 func NewFuncMap() []template.FuncMap {

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;
 }

public/less/_form.less

@@ -1,9 +1,9 @@
 .form {
 	.help {
 		color: #999999;
-	  padding-top: .6em;
+		padding-top: .6em;
-	  padding-bottom: .6em;
+		padding-bottom: .6em;
-	  display: inline-block;
+		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;
+			}			
 		}
 	}
 

public/less/_organization.less

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

routers/admin/admin.go

@@ -13,12 +13,12 @@ import (
 	"github.com/Unknwon/com"
 	"gopkg.in/macaron.v1"
 
-	"github.com/gogits/gogs/models"
+	"github.com/go-gitea/gitea/models"
-	"github.com/gogits/gogs/modules/base"
+	"github.com/go-gitea/gitea/modules/base"
-	"github.com/gogits/gogs/modules/context"
+	"github.com/go-gitea/gitea/modules/context"
-	"github.com/gogits/gogs/modules/cron"
+	"github.com/go-gitea/gitea/modules/cron"
-	"github.com/gogits/gogs/modules/process"
+	"github.com/go-gitea/gitea/modules/process"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/go-gitea/gitea/modules/setting"
 )
 
 const (

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/go-gitea/gitea/models"
-	"github.com/gogits/gogs/modules/auth"
+	"github.com/go-gitea/gitea/modules/auth"
-	"github.com/gogits/gogs/modules/auth/ldap"
+	"github.com/go-gitea/gitea/modules/auth/ldap"
-	"github.com/gogits/gogs/modules/base"
+	"github.com/go-gitea/gitea/modules/base"
-	"github.com/gogits/gogs/modules/context"
+	"github.com/go-gitea/gitea/modules/context"
-	"github.com/gogits/gogs/modules/log"
+	"github.com/go-gitea/gitea/modules/log"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/go-gitea/gitea/modules/setting"
 )
 
 const (

routers/admin/notice.go

@@ -8,11 +8,11 @@ import (
 	"github.com/Unknwon/com"
 	"github.com/Unknwon/paginater"
 
-	"github.com/gogits/gogs/models"
+	"github.com/go-gitea/gitea/models"
-	"github.com/gogits/gogs/modules/base"
+	"github.com/go-gitea/gitea/modules/base"
-	"github.com/gogits/gogs/modules/context"
+	"github.com/go-gitea/gitea/modules/context"
-	"github.com/gogits/gogs/modules/log"
+	"github.com/go-gitea/gitea/modules/log"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/go-gitea/gitea/modules/setting"
 )
 
 const (

routers/admin/orgs.go

@@ -5,11 +5,11 @@
 package admin
 
 import (
-	"github.com/gogits/gogs/models"
+	"github.com/go-gitea/gitea/models"
-	"github.com/gogits/gogs/modules/base"
+	"github.com/go-gitea/gitea/modules/base"
-	"github.com/gogits/gogs/modules/context"
+	"github.com/go-gitea/gitea/modules/context"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/go-gitea/gitea/modules/setting"
-	"github.com/gogits/gogs/routers"
+	"github.com/go-gitea/gitea/routers"
 )
 
 const (

routers/admin/repos.go

@@ -5,12 +5,12 @@
 package admin
 
 import (
-	"github.com/gogits/gogs/models"
+	"github.com/go-gitea/gitea/models"
-	"github.com/gogits/gogs/modules/base"
+	"github.com/go-gitea/gitea/modules/base"
-	"github.com/gogits/gogs/modules/context"
+	"github.com/go-gitea/gitea/modules/context"
-	"github.com/gogits/gogs/modules/log"
+	"github.com/go-gitea/gitea/modules/log"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/go-gitea/gitea/modules/setting"
-	"github.com/gogits/gogs/routers"
+	"github.com/go-gitea/gitea/routers"
 )
 
 const (

routers/admin/users.go

@@ -9,13 +9,13 @@ import (
 
 	"github.com/Unknwon/com"
 
-	"github.com/gogits/gogs/models"
+	"github.com/go-gitea/gitea/models"
-	"github.com/gogits/gogs/modules/auth"
+	"github.com/go-gitea/gitea/modules/auth"
-	"github.com/gogits/gogs/modules/base"
+	"github.com/go-gitea/gitea/modules/base"
-	"github.com/gogits/gogs/modules/context"
+	"github.com/go-gitea/gitea/modules/context"
-	"github.com/gogits/gogs/modules/log"
+	"github.com/go-gitea/gitea/modules/log"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/go-gitea/gitea/modules/setting"
-	"github.com/gogits/gogs/routers"
+	"github.com/go-gitea/gitea/routers"
 )
 
 const (

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/go-gitea/gitea/models"
-	"github.com/gogits/gogs/modules/context"
+	"github.com/go-gitea/gitea/modules/context"
-	"github.com/gogits/gogs/routers/api/v1/convert"
+	"github.com/go-gitea/gitea/routers/api/v1/convert"
-	"github.com/gogits/gogs/routers/api/v1/user"
+	"github.com/go-gitea/gitea/routers/api/v1/user"
 )
 
 // https://github.com/gogits/go-gogs-client/wiki/Administration-Organizations#create-a-new-organization

routers/api/v1/admin/org_repo.go

@@ -5,8 +5,8 @@
 package admin
 
 import (
-	"github.com/gogits/gogs/models"
+	"github.com/go-gitea/gitea/models"
-	"github.com/gogits/gogs/modules/context"
+	"github.com/go-gitea/gitea/modules/context"
 )
 
 func GetRepositoryByParams(ctx *context.APIContext) *models.Repository {

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/go-gitea/gitea/models"
-	"github.com/gogits/gogs/modules/context"
+	"github.com/go-gitea/gitea/modules/context"
-	"github.com/gogits/gogs/routers/api/v1/convert"
+	"github.com/go-gitea/gitea/routers/api/v1/convert"
-	"github.com/gogits/gogs/routers/api/v1/user"
+	"github.com/go-gitea/gitea/routers/api/v1/user"
 )
 
 func CreateTeam(ctx *context.APIContext, form api.CreateTeamOption) {

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/go-gitea/gitea/modules/context"
-	"github.com/gogits/gogs/routers/api/v1/repo"
+	"github.com/go-gitea/gitea/routers/api/v1/repo"
-	"github.com/gogits/gogs/routers/api/v1/user"
+	"github.com/go-gitea/gitea/routers/api/v1/user"
 )
 
 // https://github.com/gogits/go-gogs-client/wiki/Administration-Repositories#create-a-new-repository

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/go-gitea/gitea/models"
-	"github.com/gogits/gogs/modules/context"
+	"github.com/go-gitea/gitea/modules/context"
-	"github.com/gogits/gogs/modules/log"
+	"github.com/go-gitea/gitea/modules/log"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/go-gitea/gitea/modules/setting"
-	"github.com/gogits/gogs/routers/api/v1/user"
+	"github.com/go-gitea/gitea/routers/api/v1/user"
 )
 
 func parseLoginSource(ctx *context.APIContext, u *models.User, sourceID int64, loginName string) {

routers/api/v1/api.go

@@ -12,14 +12,14 @@ import (
 
 	api "github.com/gogits/go-gogs-client"
 
-	"github.com/gogits/gogs/models"
+	"github.com/go-gitea/gitea/models"
-	"github.com/gogits/gogs/modules/auth"
+	"github.com/go-gitea/gitea/modules/auth"
-	"github.com/gogits/gogs/modules/context"
+	"github.com/go-gitea/gitea/modules/context"
-	"github.com/gogits/gogs/routers/api/v1/admin"
+	"github.com/go-gitea/gitea/routers/api/v1/admin"
-	"github.com/gogits/gogs/routers/api/v1/misc"
+	"github.com/go-gitea/gitea/routers/api/v1/misc"
-	"github.com/gogits/gogs/routers/api/v1/org"
+	"github.com/go-gitea/gitea/routers/api/v1/org"
-	"github.com/gogits/gogs/routers/api/v1/repo"
+	"github.com/go-gitea/gitea/routers/api/v1/repo"
-	"github.com/gogits/gogs/routers/api/v1/user"
+	"github.com/go-gitea/gitea/routers/api/v1/user"
 )
 
 func repoAssignment() macaron.Handler {

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 {

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.

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/go-gitea/gitea/modules/context"
-	"github.com/gogits/gogs/modules/markdown"
+	"github.com/go-gitea/gitea/modules/markdown"
 )
 
 // https://github.com/gogits/go-gogs-client/wiki/Miscellaneous#render-an-arbitrary-markdown-document

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/go-gitea/gitea/models"
-	"github.com/gogits/gogs/modules/context"
+	"github.com/go-gitea/gitea/modules/context"
-	"github.com/gogits/gogs/routers/api/v1/convert"
+	"github.com/go-gitea/gitea/routers/api/v1/convert"
-	"github.com/gogits/gogs/routers/api/v1/user"
+	"github.com/go-gitea/gitea/routers/api/v1/user"
 )
 
 func listUserOrgs(ctx *context.APIContext, u *models.User, all bool) {

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/go-gitea/gitea/modules/context"
-	"github.com/gogits/gogs/routers/api/v1/convert"
+	"github.com/go-gitea/gitea/routers/api/v1/convert"
 )
 
 func ListTeams(ctx *context.APIContext) {

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/go-gitea/gitea/modules/context"
-	"github.com/gogits/gogs/routers/api/v1/convert"
+	"github.com/go-gitea/gitea/routers/api/v1/convert"
 )
 
 // https://github.com/gogits/go-gogs-client/wiki/Repositories#get-branch

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/go-gitea/gitea/models"
-	"github.com/gogits/gogs/modules/context"
+	"github.com/go-gitea/gitea/modules/context"
 )
 
 func AddCollaborator(ctx *context.APIContext, form api.AddCollaboratorOption) {

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/go-gitea/gitea/models"
-	"github.com/gogits/gogs/modules/context"
+	"github.com/go-gitea/gitea/modules/context"
-	"github.com/gogits/gogs/routers/repo"
+	"github.com/go-gitea/gitea/routers/repo"
 )
 
 // https://github.com/gogits/go-gogs-client/wiki/Repositories-Contents#download-raw-content

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/go-gitea/gitea/models"
-	"github.com/gogits/gogs/modules/context"
+	"github.com/go-gitea/gitea/modules/context"
-	"github.com/gogits/gogs/routers/api/v1/convert"
+	"github.com/go-gitea/gitea/routers/api/v1/convert"
 )
 
 // https://github.com/gogits/go-gogs-client/wiki/Repositories#list-hooks

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/go-gitea/gitea/models"
-	"github.com/gogits/gogs/modules/context"
+	"github.com/go-gitea/gitea/modules/context"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/go-gitea/gitea/modules/setting"
 )
 
 func ListIssues(ctx *context.APIContext) {

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/go-gitea/gitea/models"
-	"github.com/gogits/gogs/modules/context"
+	"github.com/go-gitea/gitea/modules/context"
 )
 
 func ListIssueComments(ctx *context.APIContext) {

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/go-gitea/gitea/models"
-	"github.com/gogits/gogs/modules/context"
+	"github.com/go-gitea/gitea/modules/context"
 )
 
 func ListIssueLabels(ctx *context.APIContext) {

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/go-gitea/gitea/models"
-	"github.com/gogits/gogs/modules/context"
+	"github.com/go-gitea/gitea/modules/context"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/go-gitea/gitea/modules/setting"
-	"github.com/gogits/gogs/routers/api/v1/convert"
+	"github.com/go-gitea/gitea/routers/api/v1/convert"
 )
 
 func composeDeployKeysAPILink(repoPath string) string {

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/go-gitea/gitea/models"
-	"github.com/gogits/gogs/modules/context"
+	"github.com/go-gitea/gitea/modules/context"
 )
 
 func ListLabels(ctx *context.APIContext) {

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/go-gitea/gitea/models"
-	"github.com/gogits/gogs/modules/context"
+	"github.com/go-gitea/gitea/modules/context"
 )
 
 func ListMilestones(ctx *context.APIContext) {

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/go-gitea/gitea/models"
-	"github.com/gogits/gogs/modules/auth"
+	"github.com/go-gitea/gitea/modules/auth"
-	"github.com/gogits/gogs/modules/context"
+	"github.com/go-gitea/gitea/modules/context"
-	"github.com/gogits/gogs/modules/log"
+	"github.com/go-gitea/gitea/modules/log"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/go-gitea/gitea/modules/setting"
-	"github.com/gogits/gogs/routers/api/v1/convert"
+	"github.com/go-gitea/gitea/routers/api/v1/convert"
 )
 
 // https://github.com/gogits/go-gogs-client/wiki/Repositories#search-repositories

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/go-gitea/gitea/models"
-	"github.com/gogits/gogs/modules/context"
+	"github.com/go-gitea/gitea/modules/context"
 )
 
 // https://github.com/gogits/go-gogs-client/wiki/Users#list-access-tokens-for-a-user

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/go-gitea/gitea/models"
-	"github.com/gogits/gogs/modules/context"
+	"github.com/go-gitea/gitea/modules/context"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/go-gitea/gitea/modules/setting"
-	"github.com/gogits/gogs/routers/api/v1/convert"
+	"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

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/go-gitea/gitea/models"
-	"github.com/gogits/gogs/modules/context"
+	"github.com/go-gitea/gitea/modules/context"
 )
 
 func responseApiUsers(ctx *context.APIContext, users []*models.User) {

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/go-gitea/gitea/models"
-	"github.com/gogits/gogs/modules/context"
+	"github.com/go-gitea/gitea/modules/context"
-	"github.com/gogits/gogs/modules/setting"
+	"github.com/go-gitea/gitea/modules/setting"
-	"github.com/gogits/gogs/routers/api/v1/convert"
+	"github.com/go-gitea/gitea/routers/api/v1/convert"
-	"github.com/gogits/gogs/routers/api/v1/repo"
+	"github.com/go-gitea/gitea/routers/api/v1/repo"
 )
 
 func GetUserByParamsName(ctx *context.APIContext, name string) *models.User {

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/go-gitea/gitea/models"
-	"github.com/gogits/gogs/modules/context"
+	"github.com/go-gitea/gitea/modules/context"
 )
 
 func Search(ctx *context.APIContext) {