Update glide.lock and .gopmfile [CI SKIP]

Update locales [CI SKIP]
Add test pull request task on merging a PR. Fixes #3396 (#3425 )
2026-03-01 01:30:57 +01:00 · 2016-08-10 11:57:53 -07:00 · 2016-08-10 11:54:52 -07:00 · 2016-08-10 11:38:44 -07:00 · 2016-08-10 11:35:06 -07:00 · 2016-08-10 11:06:51 -07:00
106 changed files with 1279 additions and 479 deletions
--- a/.codebeatignore
+++ b/.codebeatignore
@@ -0,0 +1,6 @@
+conf/**
+docker/**
+public/**
+packager/**
+scripts/**
+templates/**
--- a/.codebeatsettings
+++ b/.codebeatsettings
@@ -0,0 +1,7 @@
+{
+	"GOLANG": {
+		"TOTAL_LOC": [500, 999, 1999, 9999],
+		"TOO_MANY_FUNCTIONS": [50, 99, 199, 999],
+		"TOO_MANY_IVARS": [20, 50, 70, 99]
+	}
+}
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,11 @@
+public/conf/gitignore/* linguist-vendored
+public/conf/license/* linguist-vendored
 public/assets/* linguist-vendored
-public/plugins/* linguist-vendored
+public/plugins/* linguist-vendored
+public/plugins/* linguist-vendored
+public/css/themes/* linguist-vendored
+public/css/github.min.css linguist-vendored
+public/css/semantic-2.2.1.min.css linguist-vendored
+public/js/libs/* linguist-vendored
+public/js/jquery-1.11.3.min.js linguist-vendored
+public/js/semantic-2.2.1.min.js linguist-vendored
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -46,7 +46,7 @@ Please read detailed information on [Wiki](https://github.com/gogits/gogs/wiki/C

 ### Ask For Help

-Before opening an issue, please make sure your problem isn't already addressed on the [Troubleshooting](http://gogs.io/docs/intro/troubleshooting.html) and [FAQs](http://gogs.io/docs/intro/faqs.html) pages.
+Before opening an issue, please make sure your problem isn't already addressed on the [Troubleshooting](https://gogs.io/docs/intro/troubleshooting.html) and [FAQs](https://gogs.io/docs/intro/faqs.html) pages.

 ## Code of conduct

--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,8 +1,9 @@
 The issue will be closed without any reasons if it does not satisfy any of following requirements:

-1. Please do NOT post questions or config/deploy problems on GitHub, please use our forum: https://discuss.gogs.io
-2. Please take a moment to search that an issue doesn't already exist.
-3. Please give all relevant information below for bug reports; incomplete details considered invalid report.
+1. Please speak English, we have forum in [Chinese](https://discuss.gogs.io/c/getting-help/getting-help-chinese).
+2. Please post questions or config/deploy problems on our forum: https://discuss.gogs.io, here are bugs and feature requests only.
+3. Please take a moment to search that an issue doesn't already exist.
+4. Please give all relevant information below for bug reports; incomplete details considered invalid report.

 **You MUST delete above content including this line before posting; too lazy to take this action considered invalid report.**

--- a/.gopmfile
+++ b/.gopmfile
@@ -14,19 +14,19 @@ github.com/go-macaron/inject = commit:c5ab7bf
 github.com/go-macaron/session = commit:66031fc
 github.com/go-macaron/toolbox = commit:82b5115
 github.com/go-sql-driver/mysql = commit:0b58b37
-github.com/go-xorm/core = commit:bc1b7f8
-github.com/go-xorm/xorm = commit:b8b1711
+github.com/go-xorm/core = commit:5bf745d
+github.com/go-xorm/xorm = commit:c6c7056
 github.com/gogits/chardet = commit:2404f77
-github.com/gogits/cron = commit:96040e4
-github.com/gogits/git-module = commit:53bcb73
-github.com/gogits/go-gogs-client = commit:d725743
+github.com/gogits/cron = commit:7f3990a
+github.com/gogits/git-module = commit:18dd87d
+github.com/gogits/go-gogs-client = commit:d1020b4
 github.com/issue9/identicon = commit:d36b545
 github.com/jaytaylor/html2text = commit:52d9b78
 github.com/kardianos/minwinsvc = commit:cad6b2b
 github.com/klauspost/compress = commit:14eb9c4
 github.com/klauspost/cpuid = commit:09cded8
 github.com/klauspost/crc32 = commit:19b0b33
-github.com/lib/pq = commit:4dd446e
+github.com/lib/pq = commit:80f8150
 github.com/mattn/go-sqlite3 = commit:e118d44
 github.com/mcuadros/go-version = commit:d52711f
 github.com/microcosm-cc/bluemonday = commit:9dc1992
@@ -35,6 +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
 github.com/shurcooL/sanitized_anchor_name = commit:10ef21a
 github.com/Unknwon/cae = commit:7f5e046
 github.com/Unknwon/com = commit:28b053d
@@ -49,8 +50,8 @@ gopkg.in/asn1-ber.v1 = commit:4e86f43
 gopkg.in/bufio.v1 = commit:567b2bf
 gopkg.in/gomail.v2 = commit:81ebce5
 gopkg.in/ini.v1 = commit:cf53f92
-gopkg.in/ldap.v2 = commit:537128f
-gopkg.in/macaron.v1 = commit:2133042
+gopkg.in/ldap.v2 = commit:d0a5ced
+gopkg.in/macaron.v1 = commit:7564489
 gopkg.in/redis.v2 = commit:e617904

 [res]
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-Copyright (c) 2014 All Gogs Contributors
+Copyright (c) The Gogs Authors

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/8
+++ b/8
@@ -11,18 +11,20 @@ BUILD_FLAGS = "-v"
 RELEASE_ROOT = "release"
 RELEASE_GOGS = "release/gogs"
 NOW = $(shell date -u '+%Y%m%d%I%M%S')
+GOVET = go tool vet -composites=false -methods=false -structtags=false

 .PHONY: build pack release bindata clean

 .IGNORE: public/css/gogs.css

+govet:
+	$(GOVET) gogs.go 
+	$(GOVET) models modules routers
+
 build: $(GENERATED)
 	go install $(BUILD_FLAGS) -ldflags '$(LDFLAGS)' -tags '$(TAGS)'
 	cp '$(GOPATH)/bin/gogs' .

-govet:
-	go tool vet -composites=false -methods=false -structtags=false .
-
 build-dev: $(GENERATED) govet
 	go install $(BUILD_FLAGS) -tags '$(TAGS)'
 	cp '$(GOPATH)/bin/gogs' .
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra

 ![](https://github.com/gogits/gogs/blob/master/public/img/gogs-large-resize.png?raw=true)

-##### Current tip version: 0.9.60 (see [Releases](https://github.com/gogits/gogs/releases) for binary versions)
+##### Current tip version: 0.9.71 (see [Releases](https://github.com/gogits/gogs/releases) for binary versions)

 | Web | UI  | Preview  |
 |:-------------:|:-------:|:-------:|
@@ -18,7 +18,7 @@ Gogs - Go Git Service [![Build Status](https://travis-ci.org/gogits/gogs.svg?bra
 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!
 5. If you're interested in using APIs, we have experimental support with [documentation](https://github.com/gogits/go-gogs-client/wiki).
-6. If your team/company is using Gogs and would like to put your logo on [our website](http://gogs.io), contact us by any means.
+6. If your team/company is using Gogs and would like to put your logo on [our website](https://gogs.io), contact us by any means.

 [简体中文](README_ZH.md)

@@ -28,11 +28,11 @@ The goal of this project is to make the easiest, fastest, and most painless way

 ## Overview

- Please see the [Documentation](http://gogs.io/docs/intro) for common usages and change log.
+- Please see the [Documentation](https://gogs.io/docs/intro) for common usages and change log.
 - See the [Trello Board](https://trello.com/b/uxAoeLUl/gogs-go-git-service) to follow the develop team.
 - Want to try it before doing anything else? Do it [online](https://try.gogs.io/gogs/gogs)!
- Having trouble? Get help with [Troubleshooting](http://gogs.io/docs/intro/troubleshooting.html) or [User Forum](https://discuss.gogs.io/).
- Want to help with localization? Check out the [guide](http://gogs.io/docs/features/i18n.html)!
+- Having trouble? Get help with [Troubleshooting](https://gogs.io/docs/intro/troubleshooting.html) or [User Forum](https://discuss.gogs.io/).
+- Want to help with localization? Check out the [guide](https://gogs.io/docs/features/i18n.html)!

 ## Features

@@ -45,7 +45,7 @@ The goal of this project is to make the easiest, fastest, and most painless way
 - Repository Git hooks/deploy keys
 - Repository issues, pull requests and wiki
 - Add/Remove repository collaborators
- Gravatar and custom source
+- Gravatar and Federated avatar with custom source
 - Mail service
 - Administration panel
 - Supports MySQL, PostgreSQL, SQLite3 and [TiDB](https://github.com/pingcap/tidb) (experimental)
@@ -63,13 +63,13 @@ The goal of this project is to make the easiest, fastest, and most painless way

 ## Installation

-Make sure you install the [prerequisites](http://gogs.io/docs/installation) first.
+Make sure you install the [prerequisites](https://gogs.io/docs/installation) first.

 There are 5 ways to install Gogs:

- [Install from binary](http://gogs.io/docs/installation/install_from_binary.html)
- [Install from source](http://gogs.io/docs/installation/install_from_source.html)
- [Install from packages](http://gogs.io/docs/installation/install_from_packages.html)
+- [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)
 - [Install with Vagrant](https://github.com/geerlingguy/ansible-vagrant-examples/tree/master/gogs)

@@ -87,6 +87,7 @@ There are 5 ways to install Gogs:

 ### Screencasts

+- [How to install Gogs on a Linux Server (DigitalOcean)](https://www.youtube.com/watch?v=deSfX0gqefE)
 - [Instalando Gogs no Ubuntu](https://www.youtube.com/watch?v=4UkHAR1F7ZA) (Português)

 ### Deploy to Cloud
--- a/README_ZH.md
+++ b/README_ZH.md
@@ -9,11 +9,11 @@ Gogs 的目标是打造一个最简单、最快速和最轻松的方式搭建自

 ## 项目概览

- 有关基本用法和变更日志，请通过 [使用手册](http://gogs.io/docs/intro/) 查看。
+- 有关基本用法和变更日志，请通过 [使用手册](https://gogs.io/docs/intro/) 查看。
 - 您可以到 [Trello Board](https://trello.com/b/uxAoeLUl/gogs-go-git-service) 跟随开发团队的脚步。
 - 想要先睹为快？直接去 [在线体验](https://try.gogs.io/gogs/gogs) 。
- 使用过程中遇到问题？尝试从 [故障排查](http://gogs.io/docs/intro/troubleshooting.html) 页面或 [用户论坛](https://discuss.gogs.io/) 获取帮助。
- 希望帮助多国语言界面的翻译吗？请立即访问 [详情页面](http://gogs.io/docs/features/i18n.html)！
+- 使用过程中遇到问题？尝试从 [故障排查](https://gogs.io/docs/intro/troubleshooting.html) 页面或 [用户论坛](https://discuss.gogs.io/) 获取帮助。
+- 希望帮助多国语言界面的翻译吗？请立即访问 [详情页面](https://gogs.io/docs/features/i18n.html)！

 ## 功能特性

@@ -26,7 +26,7 @@ Gogs 的目标是打造一个最简单、最快速和最轻松的方式搭建自
 - 支持仓库 Git 钩子和部署密钥
 - 支持仓库工单（Issue）、合并请求（Pull Request）以及 Wiki
 - 支持添加和删除仓库协作者
- 支持 Gravatar 以及自定义源
+- 支持自定义源的 Gravatar 和 Federated Avatar
 - 支持邮件服务
 - 支持后台管理面板
 - 支持 MySQL、PostgreSQL、SQLite3 和 [TiDB](https://github.com/pingcap/tidb)（实验性支持） 数据库
@@ -44,13 +44,13 @@ Gogs 的目标是打造一个最简单、最快速和最轻松的方式搭建自

 ## 安装部署

-在安装 Gogs 之前，您需要先安装 [基本环境](http://gogs.io/docs/installation)。
+在安装 Gogs 之前，您需要先安装 [基本环境](https://gogs.io/docs/installation)。

 然后，您可以通过以下 5 种方式来安装 Gogs：

- [二进制安装](http://gogs.io/docs/installation/install_from_binary.html)
- [源码安装](http://gogs.io/docs/installation/install_from_source.html)
- [包管理安装](http://gogs.io/docs/installation/install_from_packages.html)
+- [二进制安装](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)
 - [通过 Vagrant 安装](https://github.com/geerlingguy/ansible-vagrant-examples/tree/master/gogs)

--- a/cmd/web.go
+++ b/cmd/web.go
@@ -86,9 +86,9 @@ func checkVersion() {
 		{"github.com/go-macaron/session", session.Version, "0.1.6"},
 		{"github.com/go-macaron/toolbox", toolbox.Version, "0.1.0"},
 		{"gopkg.in/ini.v1", ini.Version, "1.8.4"},
-		{"gopkg.in/macaron.v1", macaron.Version, "1.1.4"},
-		{"github.com/gogits/git-module", git.Version, "0.3.3"},
-		{"github.com/gogits/go-gogs-client", gogs.Version, "0.10.1"},
+		{"gopkg.in/macaron.v1", macaron.Version, "1.1.7"},
+		{"github.com/gogits/git-module", git.Version, "0.3.4"},
+		{"github.com/gogits/go-gogs-client", gogs.Version, "0.10.3"},
 	}
 	for _, c := range checkers {
 		if !version.Compare(c.Version(), c.Expected, ">=") {
@@ -226,7 +226,8 @@ func runWeb(ctx *cli.Context) error {
 	m.Group("/user/settings", func() {
 		m.Get("", user.Settings)
 		m.Post("", bindIgnErr(auth.UpdateProfileForm{}), user.SettingsPost)
-		m.Post("/avatar", binding.MultipartForm(auth.UploadAvatarForm{}), user.SettingsAvatar)
+		m.Combo("/avatar").Get(user.SettingsAvatar).
+			Post(binding.MultipartForm(auth.AvatarForm{}), user.SettingsAvatarPost)
 		m.Post("/avatar/delete", user.SettingsDeleteAvatar)
 		m.Combo("/email").Get(user.SettingsEmails).
 			Post(bindIgnErr(auth.AddEmailForm{}), user.SettingsEmailPost)
@@ -375,7 +376,7 @@ func runWeb(ctx *cli.Context) error {
 			m.Group("/settings", func() {
 				m.Combo("").Get(org.Settings).
 					Post(bindIgnErr(auth.UpdateOrgSettingForm{}), org.SettingsPost)
-				m.Post("/avatar", binding.MultipartForm(auth.UploadAvatarForm{}), org.SettingsAvatar)
+				m.Post("/avatar", binding.MultipartForm(auth.AvatarForm{}), org.SettingsAvatar)
 				m.Post("/avatar/delete", org.SettingsDeleteAvatar)

 				m.Group("/hooks", func() {
@@ -448,15 +449,17 @@ func runWeb(ctx *cli.Context) error {

 	m.Get("/:username/:reponame/action/:action", reqSignIn, context.RepoAssignment(), repo.Action)
 	m.Group("/:username/:reponame", func() {
+		// FIXME: should use different URLs but mostly same logic for comments of issue and pull reuqest.
+		// So they can apply their own enable/disable logic on routers.
 		m.Group("/issues", func() {
 			m.Combo("/new", repo.MustEnableIssues).Get(context.RepoRef(), repo.NewIssue).
 				Post(bindIgnErr(auth.CreateIssueForm{}), repo.NewIssuePost)

-			m.Combo("/:index/comments").Post(bindIgnErr(auth.CreateCommentForm{}), repo.NewComment)
 			m.Group("/:index", func() {
 				m.Post("/label", repo.UpdateIssueLabel)
 				m.Post("/milestone", repo.UpdateIssueMilestone)
 				m.Post("/assignee", repo.UpdateIssueAssignee)
+				m.Combo("/comments").Post(bindIgnErr(auth.CreateCommentForm{}), repo.NewComment)
 			}, reqRepoWriter)

 			m.Group("/:index", func() {
@@ -472,7 +475,7 @@ func runWeb(ctx *cli.Context) error {
 			m.Post("/new", bindIgnErr(auth.CreateLabelForm{}), repo.NewLabel)
 			m.Post("/edit", bindIgnErr(auth.CreateLabelForm{}), repo.UpdateLabel)
 			m.Post("/delete", repo.DeleteLabel)
-		}, reqRepoWriter, context.RepoRef())
+		}, repo.MustEnableIssues, reqRepoWriter, context.RepoRef())
 		m.Group("/milestones", func() {
 			m.Combo("/new").Get(repo.NewMilestone).
 				Post(bindIgnErr(auth.CreateMilestoneForm{}), repo.NewMilestonePost)
@@ -480,7 +483,7 @@ func runWeb(ctx *cli.Context) error {
 			m.Post("/:id/edit", bindIgnErr(auth.CreateMilestoneForm{}), repo.EditMilestonePost)
 			m.Get("/:id/:action", repo.ChangeMilestonStatus)
 			m.Post("/delete", repo.DeleteMilestone)
-		}, reqRepoWriter, context.RepoRef())
+		}, repo.MustEnableIssues, reqRepoWriter, context.RepoRef())

 		m.Group("/releases", func() {
 			m.Get("/new", repo.NewRelease)
--- a/conf/app.ini
+++ b/conf/app.ini
@@ -229,7 +229,12 @@ AVATAR_UPLOAD_PATH = data/avatars
 ; Chinese users can choose "duoshuo"
 ; or a custom avatar source, like: http://cn.gravatar.com/avatar/
 GRAVATAR_SOURCE = gravatar
+; This value will be forced to be true in offline mode.
 DISABLE_GRAVATAR = false
+; Federated avatar lookup uses DNS to discover avatar associated
+; with emails, see http://www.libravatar.org
+; This value will be forced to be false in offline mode or Gravatar is disbaled.
+ENABLE_FEDERATED_AVATAR = false

 [attachment]
 ; Whether attachments are enabled. Defaults to `true`
@@ -334,11 +339,13 @@ RUN_AT_START = true
 SCHEDULE = @every 24h

 [git]
-; Max number of lines allowed of a single file in diff view.
+; Disables highlight of added and removed changes
+DISABLE_DIFF_HIGHLIGHT = false
+; Max number of lines allowed of a single file in diff view
 MAX_GIT_DIFF_LINES = 1000
-; Max number of characters of a line allowed in diff view.
+; Max number of characters of a line allowed in diff view
 MAX_GIT_DIFF_LINE_CHARACTERS = 500
-; Max number of files shown in diff view.
+; Max number of files shown in diff view
 MAX_GIT_DIFF_FILES = 100
 ; Arguments for command 'git gc', e.g. "--aggressive --auto"
 ; see more on http://git-scm.com/docs/git-gc/1.7.5
@@ -350,6 +357,11 @@ MIGRATE = 600
 MIRROR = 300
 CLONE = 300
 PULL = 300
+GC = 60
+
+[mirror]
+; Default interval in hours between each check
+DEFAULT_INTERVAL = 24

 [api]
 ; Max number of items will response in a page
--- a/conf/locale/TRANSLATORS
+++ b/conf/locale/TRANSLATORS
@@ -31,6 +31,7 @@ ilko <kontact-mr.k AT outlook DOT com">
 Ilya Makarov
 Jamie Mansfield <dev AT jamierocks DOT uk>
 Jean THOMAS <contact AT tibounise DOT com>
+Joubert RedRat <me+github AT redrat DOT com DOT br>
 Juraj Bubniak <contact AT jbub DOT eu>
 Lafriks <lafriks AT gmail DOT com>
 Lauri Ojansivu <x AT xet7 DOT org>
--- a/conf/locale/locale_bg-BG.ini
+++ b/conf/locale/locale_bg-BG.ini
@@ -96,6 +96,8 @@ offline_mode=Включи офлайн режима
 offline_mode_popup=Изключи CDN дори в продукционен режим, всички ресурсни файлове ще бъдат доставяни локално.
 disable_gravatar=Изключи връзка с Gravatar
 disable_gravatar_popup=Изключва Gravatar и външни източници, така че всички аватари трябва да са или качени от потребителите или да се ползват аватари по подразбиране.
+federated_avatar_lookup=Enable Federated Avatars Lookup
+federated_avatar_lookup_popup=Enable federated avatars lookup to use federated open source service based on libravatar.
 disable_registration=Изключи саморегистрацията
 disable_registration_popup=Изключи потребителската саморегистрация, само администратор може да създава профили.
 enable_captcha=Включи Captcha
@@ -239,6 +241,7 @@ form.name_pattern_not_allowed=Потребителското име '%s' не е
 [settings]
 profile=Профил
 password=Парола
+avatar=Avatar
 ssh_keys=SSH ключове
 social=Социални профили
 applications=Приложения
@@ -259,6 +262,8 @@ change_username_prompt=Този промяна ще засегне всички
 continue=Продължи
 cancel=Отказ

+lookup_avatar_by_mail=Lookup Avatar by mail
+federated_avatar_lookup=Federated Avatar Lookup
 enable_custom_avatar=Разреши потребителски аватар
 choose_new_avatar=Избор на нов аватар
 update_avatar=Запази настройките на аватара
@@ -345,7 +350,7 @@ fork_from=Разклонение от
 fork_visiblity_helper=Не може да променяте видимостта на разклонено хранилище.
 repo_desc=Описание
 repo_lang=Програмен език
-repo_lang_helper=Изберете .gitignore файлове
+repo_gitignore_helper=Select .gitignore templates
 license=Лиценз
 license_helper=Изберете лицензионен файл
 readme=Readme
@@ -579,11 +584,13 @@ settings.site=Официален сайт
 settings.update_settings=Запази настройките
 settings.change_reponame_prompt=Тази промяна ще засегне връзките, които се отнасят до това хранилището.
 settings.advanced_settings=Разширени настройки
-settings.wiki_desc=Включва уики за да може потребителите да създават документи
+settings.wiki_desc=Enable wiki system
+settings.use_internal_wiki=Use builtin wiki
 settings.use_external_wiki=Използвай външно уики
 settings.external_wiki_url=URL адрес на външно уики
 settings.external_wiki_url_desc=Посетителите ще бъдат пренасочени към този URL адрес от връзката за раздел уики.
-settings.issues_desc=Включва вградена система за проследяване на задачи
+settings.issues_desc=Enable issue tracker
+settings.use_internal_issue_tracker=Use builtin lightweight issue tracker
 settings.use_external_issue_tracker=Използвай външна система за проследяване на задачи
 settings.tracker_url_format=Формат на URL адрес на външна система за проследяване на задачи
 settings.tracker_issue_style=Стил на именуване на външна система за проследяване на задачи:
@@ -1001,6 +1008,7 @@ config.db_ssl_mode=SSL режим
 config.db_ssl_mode_helper=(само за postgres)
 config.db_path=Път
 config.db_path_helper=(за "sqlite3" и "tidb")
+
 config.service_config=Настройка на услугата
 config.register_email_confirm=Изисквай потвърждение на адреси на ел. поща
 config.disable_register=Изключи нови регистрации
@@ -1011,10 +1019,12 @@ config.disable_key_size_check=Изключи проверка минимален
 config.enable_captcha=Включи Captcha
 config.active_code_lives=Кодове за активиране
 config.reset_password_code_lives=Кодове за изчистване на парола
+
 config.webhook_config=Конфигурация на уеб-куки
 config.queue_length=Дължина на опашка
 config.deliver_timeout=Време за отказ при изпращане
 config.skip_tls_verify=Пропусни проверка на TLS
+
 config.mailer_config=Конфигурация на мейлър
 config.mailer_enabled=Активен
 config.mailer_disable_helo=Изключи HELO
@@ -1024,12 +1034,15 @@ config.mailer_user=Потребител
 config.send_test_mail=Изпрати тестово писмо
 config.test_mail_failed=Невъзможно изпращане на тестово писмо до '%s': %v
 config.test_mail_sent=Тестово писмо беше изпратено до '%s'.
+
 config.oauth_config=OAuth конфигурация
 config.oauth_enabled=Активна
+
 config.cache_config=Конфигурация на кеша
 config.cache_adapter=Кеш адаптер
 config.cache_interval=Кеш интервал
 config.cache_conn=Кеш на връзката
+
 config.session_config=Конфигурация на сесии
 config.session_provider=Доставчик на сесии
 config.provider_config=Конфигурация на доставчик
@@ -1039,9 +1052,24 @@ config.gc_interval_time=GC през интервал
 config.session_life_time=Период на валидност на сесиите
 config.https_only=HTTPS само
 config.cookie_life_time=Период на валидност на бисквитките
+
 config.picture_config=Конфигурация на изображения
 config.picture_service=Услуги за снимки
 config.disable_gravatar=Изключи Gravatar
+config.enable_federated_avatar=Enable Federated Avatars
+
+config.git_config=Git Configuration
+config.git_disable_diff_highlight=Disable Diff Syntax Highlight
+config.git_max_diff_lines=Max Diff Lines (for a single file)
+config.git_max_diff_line_characters=Max Diff Characters (for a single line)
+config.git_max_diff_files=Max Diff Files (to be shown)
+config.git_gc_args=GC Arguments
+config.git_migrate_timeout=Migration Timeout
+config.git_mirror_timeout=Mirror Update Timeout
+config.git_clone_timeout=Clone Operation Timeout
+config.git_pull_timeout=Pull Operation Timeout
+config.git_gc_timeout=GC Operation Timeout
+
 config.log_config=Конфигурация на журнал
 config.log_mode=Режим на журнал

--- a/conf/locale/locale_cs-CZ.ini
+++ b/conf/locale/locale_cs-CZ.ini
@@ -96,6 +96,8 @@ offline_mode=Zapnout režim offline
 offline_mode_popup=Vypnout síť doručování obsahu (CDN) i v produkčním režimu, vše bude obslouženo místně.
 disable_gravatar=Vypnout službu Gravatar
 disable_gravatar_popup=Vypnout službu Gravatar a ostatní zdroje. Všechny ikony uživatelů budou nahrány uživateli nebo výchozí.
+federated_avatar_lookup=Enable Federated Avatars Lookup
+federated_avatar_lookup_popup=Enable federated avatars lookup to use federated open source service based on libravatar.
 disable_registration=Vypnout možnost se zaregistrovat
 disable_registration_popup=Vypnout možnost registrace, pouze správce může vytvořit účty.
 enable_captcha=Povolit službu CAPTCHA
@@ -239,6 +241,7 @@ form.name_pattern_not_allowed=Vzor uživatelského jména '%s' není povolen.
 [settings]
 profile=Profil
 password=Heslo
+avatar=Avatar
 ssh_keys=Klíče SSH
 social=Sociální účty
 applications=Aplikace
@@ -259,6 +262,8 @@ change_username_prompt=Tato změna ovlivní vztah odkazů k vašemu účtu.
 continue=Pokračovat
 cancel=Zrušit

+lookup_avatar_by_mail=Lookup Avatar by mail
+federated_avatar_lookup=Federated Avatar Lookup
 enable_custom_avatar=Povolit uživatelskou ikonu uživatele
 choose_new_avatar=Vybrat novou ikonu uživatele
 update_avatar=Aktualizovat nastavení ikony uživatele
@@ -345,7 +350,7 @@ fork_from=Rozštěpit z
 fork_visiblity_helper=Nemůžete změnit viditelnost repositáře rozštěpení.
 repo_desc=Popis
 repo_lang=Jazyk
-repo_lang_helper=Nastavit soubory .gitignore
+repo_gitignore_helper=Select .gitignore templates
 license=Licence
 license_helper=Vyberte licenční soubor
 readme=Soubor README
@@ -579,11 +584,13 @@ settings.site=Oficiální stránky
 settings.update_settings=Změnit nastavení
 settings.change_reponame_prompt=Tato změna ovlivní vztah odkazů k repositáři.
 settings.advanced_settings=Pokročilá nastavení
-settings.wiki_desc=Povolit Wiki, aby lidé mohli psát dokumenty
+settings.wiki_desc=Enable wiki system
+settings.use_internal_wiki=Use builtin wiki
 settings.use_external_wiki=Používat externí Wiki
 settings.external_wiki_url=URL externí Wiki
 settings.external_wiki_url_desc=Návštěvníci budou při kliknutí na záložku přesměrování na tuto URL.
-settings.issues_desc=Povolit vestavěný jednoduchý systém úkolů
+settings.issues_desc=Enable issue tracker
+settings.use_internal_issue_tracker=Use builtin lightweight issue tracker
 settings.use_external_issue_tracker=Použít externí systém úkolů
 settings.tracker_url_format=Formát URL externího systému úkolů
 settings.tracker_issue_style=External Issue Tracker Naming Style:
@@ -1001,6 +1008,7 @@ config.db_ssl_mode=Režim SSL
 config.db_ssl_mode_helper=(pouze pro 'postgres')
 config.db_path=Cesta
 config.db_path_helper=(pro "sqlite3" a "tidb")
+
 config.service_config=Nastavení služby
 config.register_email_confirm=Vyžadovat potvrzení e-mailem
 config.disable_register=Vypnout registraci
@@ -1011,10 +1019,12 @@ config.disable_key_size_check=Vypnout kontrolu minimální velikosti klíčů
 config.enable_captcha=Povolit službu CAPTCHA
 config.active_code_lives=Doba života aktivního kódu
 config.reset_password_code_lives=Lhůta kódu pro obnovu hesla
+
 config.webhook_config=Nastavení webových háčků
 config.queue_length=Délka fronty
 config.deliver_timeout=Časový limit doručení
 config.skip_tls_verify=Přeskočit ověření TLS
+
 config.mailer_config=Nastavení odesílání e-mailů
 config.mailer_enabled=Zapnutý
 config.mailer_disable_helo=Zakázat HELO
@@ -1024,12 +1034,15 @@ config.mailer_user=Uživatel
 config.send_test_mail=Odeslat zkušební E-mail
 config.test_mail_failed=Odeslání testovacího e-mailu na '%s' selhalo: %v
 config.test_mail_sent=Zkušební e-mail byl odeslán na '%s'.
+
 config.oauth_config=Nastavení ověření OAuth
 config.oauth_enabled=Zapnutý
+
 config.cache_config=Nastavení mezipaměti
 config.cache_adapter=Adaptér mezipaměti
 config.cache_interval=Interval mezipaměti
 config.cache_conn=Připojení mezipaměti
+
 config.session_config=Nastavení relace
 config.session_provider=Poskytovatel relace
 config.provider_config=Nastavení poskytovatele
@@ -1039,9 +1052,24 @@ config.gc_interval_time=Čas intervalu GC
 config.session_life_time=Doba trvání relace
 config.https_only=Pouze protokol HTTPS
 config.cookie_life_time=Doba života souboru cookie
+
 config.picture_config=Nastavení ikony uživatele
 config.picture_service=Služba ikon uživatelů
 config.disable_gravatar=Zakázat službu Gravatar
+config.enable_federated_avatar=Enable Federated Avatars
+
+config.git_config=Git Configuration
+config.git_disable_diff_highlight=Disable Diff Syntax Highlight
+config.git_max_diff_lines=Max Diff Lines (for a single file)
+config.git_max_diff_line_characters=Max Diff Characters (for a single line)
+config.git_max_diff_files=Max Diff Files (to be shown)
+config.git_gc_args=GC Arguments
+config.git_migrate_timeout=Migration Timeout
+config.git_mirror_timeout=Mirror Update Timeout
+config.git_clone_timeout=Clone Operation Timeout
+config.git_pull_timeout=Pull Operation Timeout
+config.git_gc_timeout=GC Operation Timeout
+
 config.log_config=Nastavení logů
 config.log_mode=Způsob logování

--- a/conf/locale/locale_de-DE.ini
+++ b/conf/locale/locale_de-DE.ini
@@ -96,6 +96,8 @@ offline_mode=Offline-Modus aktivieren
 offline_mode_popup=CDN auch im Produktivmodus deaktivieren. Alle Dateien werden von diesem Server ausgeliefert.
 disable_gravatar=Gravatar-Dienst deaktivieren
 disable_gravatar_popup=Gravatar und benutzerdefinierte Quellen deaktivieren. Alle Profilbilder werden vom Nutzer hochgeladen oder sind das Standard-Profilbild.
+federated_avatar_lookup=Enable Federated Avatars Lookup
+federated_avatar_lookup_popup=Enable federated avatars lookup to use federated open source service based on libravatar.
 disable_registration=Registrierung deaktivieren
 disable_registration_popup=Registrierung neuer Benutzer deaktivieren. Nur Administratoren können Benutzerkonten anlegen.
 enable_captcha=Captcha aktivieren
@@ -239,6 +241,7 @@ form.name_pattern_not_allowed=Benutzernamen der Form '%s' sind nicht erlaubt.
 [settings]
 profile=Profil
 password=Passwort
+avatar=Avatar
 ssh_keys=SSH-Schlüssel
 social=Soziale Konten
 applications=Anwendungen
@@ -259,6 +262,8 @@ change_username_prompt=Diese Änderung wirkt sich auf die Links zu Ihrem Benutze
 continue=Weiter
 cancel=Abbrechen

+lookup_avatar_by_mail=Lookup Avatar by mail
+federated_avatar_lookup=Federated Avatar Lookup
 enable_custom_avatar=Benutzerdefiniertes Profilbild aktivieren
 choose_new_avatar=Neues Profilbild auswählen
 update_avatar=Profilbildeinstellungen aktualisieren
@@ -345,7 +350,7 @@ fork_from=Fork von
 fork_visiblity_helper=Die Sichtbarkeit von geforkten Repositories ist nicht veränderbar.
 repo_desc=Beschreibung
 repo_lang=Sprache
-repo_lang_helper=Wählen Sie eine .gitignore-Datei aus
+repo_gitignore_helper=Select .gitignore templates
 license=Lizenz
 license_helper=Wählen Sie eine Lizenz aus
 readme=Readme
@@ -579,11 +584,13 @@ settings.site=Offizielle Webseite
 settings.update_settings=Einstellungen speichern
 settings.change_reponame_prompt=Diese Änderung wirkt sich darauf aus, wie sich Links auf Repositories beziehen.
 settings.advanced_settings=Erweiterte Einstellungen
-settings.wiki_desc=Wiki aktivieren, damit Benutzer Seiten anlegen können
+settings.wiki_desc=Enable wiki system
+settings.use_internal_wiki=Use builtin wiki
 settings.use_external_wiki=Externes Wiki verwenden
 settings.external_wiki_url=Externe Wiki URL
 settings.external_wiki_url_desc=Besucher werden auf diese URL umgeleitet, wenn sie auf den Tab klicken.
-settings.issues_desc=Eingebautes einfaches Issue-System verwenden
+settings.issues_desc=Enable issue tracker
+settings.use_internal_issue_tracker=Use builtin lightweight issue tracker
 settings.use_external_issue_tracker=Externes Issue-System verwenden
 settings.tracker_url_format=URL-Format des externen Issue-Systems
 settings.tracker_issue_style=Namenskonvention des externen Issue-Trackers:
@@ -1001,6 +1008,7 @@ config.db_ssl_mode=SSL-Modus
 config.db_ssl_mode_helper=(nur für "postgres")
 config.db_path=Verzeichnis
 config.db_path_helper=(für "sqlite3" und "tidb")
+
 config.service_config=Service-Konfiguration
 config.register_email_confirm=E-Mail-Bestätigung bei Registrierung
 config.disable_register=Registrierung deaktivieren
@@ -1011,10 +1019,12 @@ config.disable_key_size_check=Prüfung der Mindestschlüssellänge deaktiveren
 config.enable_captcha=Captcha aktivieren
 config.active_code_lives=Aktivierungscode Lebensdauer
 config.reset_password_code_lives=Passwortcode Lebensdauer
+
 config.webhook_config=Webhook-Konfiguration
 config.queue_length=Warteschlangenlänge
 config.deliver_timeout=Zeitlimit für Zustellung
 config.skip_tls_verify=TLS verifikation überspringen
+
 config.mailer_config=Mailer-Konfiguration
 config.mailer_enabled=Aktiviert
 config.mailer_disable_helo=HELO Deaktivieren
@@ -1024,12 +1034,15 @@ config.mailer_user=Benutzer
 config.send_test_mail=Test-E-Mail senden
 config.test_mail_failed=Das Senden der Test-E-Mail an '%s': %v ist fehlgeschlagen
 config.test_mail_sent=Test-E-Mail wurde an '%s' gesendet.
+
 config.oauth_config=OAuth-Konfiguration
 config.oauth_enabled=Aktiviert
+
 config.cache_config=Cache-Konfiguration
 config.cache_adapter=Cache-Adapter
 config.cache_interval=Cache-Intervall
 config.cache_conn=Cache-Anbindung
+
 config.session_config=Session-Konfiguration
 config.session_provider=Session-Provider
 config.provider_config=Provider-Einstellungen
@@ -1039,9 +1052,24 @@ config.gc_interval_time=GC-Intervall
 config.session_life_time=Session-Lebensdauer
 config.https_only=Nur HTTPS
 config.cookie_life_time=Cookie-Lebensdauer
+
 config.picture_config=Konfiguration der Profilbilder
 config.picture_service=Bildservice
 config.disable_gravatar=Gravatar deaktivieren
+config.enable_federated_avatar=Enable Federated Avatars
+
+config.git_config=Git Configuration
+config.git_disable_diff_highlight=Disable Diff Syntax Highlight
+config.git_max_diff_lines=Max Diff Lines (for a single file)
+config.git_max_diff_line_characters=Max Diff Characters (for a single line)
+config.git_max_diff_files=Max Diff Files (to be shown)
+config.git_gc_args=GC Arguments
+config.git_migrate_timeout=Migration Timeout
+config.git_mirror_timeout=Mirror Update Timeout
+config.git_clone_timeout=Clone Operation Timeout
+config.git_pull_timeout=Pull Operation Timeout
+config.git_gc_timeout=GC Operation Timeout
+
 config.log_config=Konfiguration des Loggings
 config.log_mode=Log-Modus

--- a/conf/locale/locale_en-US.ini
+++ b/conf/locale/locale_en-US.ini
@@ -96,6 +96,8 @@ offline_mode = Enable Offline Mode
 offline_mode_popup = Disable CDN even in production mode, all resource files will be served locally.
 disable_gravatar = Disable Gravatar Service
 disable_gravatar_popup = Disable Gravatar and custom sources, all avatars are uploaded by users or default.
+federated_avatar_lookup = Enable Federated Avatars Lookup
+federated_avatar_lookup_popup = Enable federated avatars lookup to use federated open source service based on libravatar.
 disable_registration = Disable Self-registration
 disable_registration_popup = Disable user self-registration, only admin can create accounts.
 enable_captcha = Enable Captcha
@@ -239,6 +241,7 @@ form.name_pattern_not_allowed = Username pattern '%s' is not allowed.
 [settings]
 profile = Profile
 password = Password
+avatar = Avatar
 ssh_keys = SSH Keys
 social = Social Accounts
 applications = Applications
@@ -259,7 +262,9 @@ change_username_prompt = This change will affect the way how links relate to you
 continue = Continue
 cancel = Cancel

-enable_custom_avatar = Enable Custom Avatar
+lookup_avatar_by_mail = Lookup Avatar by mail
+federated_avatar_lookup = Federated Avatar Lookup
+enable_custom_avatar = Use Custom Avatar
 choose_new_avatar = Choose new avatar
 update_avatar = Update Avatar Setting
 delete_current_avatar = Delete Current Avatar
@@ -345,7 +350,7 @@ fork_from = Fork From
 fork_visiblity_helper = You cannot alter the visibility of a forked repository.
 repo_desc = Description
 repo_lang = Language
-repo_lang_helper = Select .gitignore files
+repo_gitignore_helper = Select .gitignore templates
 license = License
 license_helper = Select a license file
 readme = Readme
@@ -1003,6 +1008,7 @@ config.db_ssl_mode = SSL Mode
 config.db_ssl_mode_helper = (for "postgres" only)
 config.db_path = Path
 config.db_path_helper = (for "sqlite3" and "tidb")
+
 config.service_config = Service Configuration
 config.register_email_confirm = Require Email Confirmation
 config.disable_register = Disable Registration
@@ -1013,10 +1019,12 @@ config.disable_key_size_check = Disable Minimum Key Size Check
 config.enable_captcha = Enable Captcha
 config.active_code_lives = Active Code Lives
 config.reset_password_code_lives = Reset Password Code Lives
+
 config.webhook_config = Webhook Configuration
 config.queue_length = Queue Length
 config.deliver_timeout = Deliver Timeout
 config.skip_tls_verify = Skip TLS Verify
+
 config.mailer_config = Mailer Configuration
 config.mailer_enabled = Enabled
 config.mailer_disable_helo = Disable HELO
@@ -1026,12 +1034,15 @@ config.mailer_user = User
 config.send_test_mail = Send Test Email
 config.test_mail_failed = Fail to send test email to '%s': %v
 config.test_mail_sent = Test email has been sent to '%s'.
+
 config.oauth_config = OAuth Configuration
 config.oauth_enabled = Enabled
+
 config.cache_config = Cache Configuration
 config.cache_adapter = Cache Adapter
 config.cache_interval = Cache Interval
 config.cache_conn = Cache Connection
+
 config.session_config = Session Configuration
 config.session_provider = Session Provider
 config.provider_config = Provider Config
@@ -1041,9 +1052,24 @@ config.gc_interval_time = GC Interval Time
 config.session_life_time = Session Life Time
 config.https_only = HTTPS Only
 config.cookie_life_time = Cookie Life Time
+
 config.picture_config = Picture Configuration
 config.picture_service = Picture Service
 config.disable_gravatar = Disable Gravatar
+config.enable_federated_avatar = Enable Federated Avatars
+
+config.git_config = Git Configuration
+config.git_disable_diff_highlight = Disable Diff Syntax Highlight
+config.git_max_diff_lines = Max Diff Lines (for a single file)
+config.git_max_diff_line_characters = Max Diff Characters (for a single line)
+config.git_max_diff_files = Max Diff Files (to be shown)
+config.git_gc_args = GC Arguments
+config.git_migrate_timeout = Migration Timeout
+config.git_mirror_timeout = Mirror Update Timeout
+config.git_clone_timeout = Clone Operation Timeout
+config.git_pull_timeout = Pull Operation Timeout
+config.git_gc_timeout = GC Operation Timeout
+
 config.log_config = Log Configuration
 config.log_mode = Log Mode

--- a/conf/locale/locale_es-ES.ini
+++ b/conf/locale/locale_es-ES.ini
@@ -96,6 +96,8 @@ offline_mode=Activar el modo Sin Conexión
 offline_mode_popup=Desactivar el CDN incluso en el modo de producción, todos los recursos se servirán localmente.
 disable_gravatar=Desactivar el servicio Gravatar
 disable_gravatar_popup=Desactivar Gravatar y cualquier otra fuente personalizada. Todos los avatares deben ser cargados por los usuarios o en su defecto se mostrará el avatar predeterminado.
+federated_avatar_lookup=Enable Federated Avatars Lookup
+federated_avatar_lookup_popup=Enable federated avatars lookup to use federated open source service based on libravatar.
 disable_registration=Desactivar Auto-Registro
 disable_registration_popup=Desactivar auto-registro del usuario, solo el administrador podrá crear cuentas nuevas.
 enable_captcha=Activar la Captcha
@@ -239,6 +241,7 @@ form.name_pattern_not_allowed=El patrón de nombre de usuario '%s' no está perm
 [settings]
 profile=Perfil
 password=Contraseña
+avatar=Avatar
 ssh_keys=Claves SSH
 social=Redes Sociales
 applications=Aplicaciones
@@ -259,6 +262,8 @@ change_username_prompt=Este cambio afectará a los enlaces que hacen referencia
 continue=Continuar
 cancel=Cancelar

+lookup_avatar_by_mail=Lookup Avatar by mail
+federated_avatar_lookup=Federated Avatar Lookup
 enable_custom_avatar=Activar avatar personalizado
 choose_new_avatar=Selecciona nuevo avatar
 update_avatar=Actualizar configuración del avatar
@@ -345,7 +350,7 @@ fork_from=Crear un Fork desde
 fork_visiblity_helper=No es posible cambiar la visibilidad de un Fork
 repo_desc=Descripción
 repo_lang=Idioma
-repo_lang_helper=Seleccione archivo .gitignore
+repo_gitignore_helper=Select .gitignore templates
 license=Licencia
 license_helper=Selecciona un fichero de licencia
 readme=Readme
@@ -579,11 +584,13 @@ settings.site=Sitio oficial
 settings.update_settings=Actualizar configuración
 settings.change_reponame_prompt=Este cambio afectará a los enlaces al repositorio.
 settings.advanced_settings=Ajustes avanzados
-settings.wiki_desc=Habilitar la Wiki para que los colaboradores documenten
+settings.wiki_desc=Enable wiki system
+settings.use_internal_wiki=Use builtin wiki
 settings.use_external_wiki=Usar Wiki externa
 settings.external_wiki_url=URL externa de la Wiki
 settings.external_wiki_url_desc=Los visitantes serán redireccionados a la URL cuando hagan click en la barra.
-settings.issues_desc=Habilitar tracker ligero de incidencias
+settings.issues_desc=Enable issue tracker
+settings.use_internal_issue_tracker=Use builtin lightweight issue tracker
 settings.use_external_issue_tracker=Usar tracker externo de incidencias
 settings.tracker_url_format=Formato URL del tracker de incidencias externo
 settings.tracker_issue_style=Estilo de etiquetado del tracker externo de incidencias:
@@ -1001,6 +1008,7 @@ config.db_ssl_mode=Modo SSL
 config.db_ssl_mode_helper=(sólo para "postgres")
 config.db_path=Ruta
 config.db_path_helper=(para "sqlite3" y "tidb")
+
 config.service_config=Configuración del servicio
 config.register_email_confirm=Solicitar Confirmación por Correo Electrónico
 config.disable_register=Deshabilitar el Registro
@@ -1011,10 +1019,12 @@ config.disable_key_size_check=Deshabilitar la comprobación de Tamaño Mínimo d
 config.enable_captcha=Activar Captcha
 config.active_code_lives=Habilitar Vida del Código
 config.reset_password_code_lives=Restablecer Contraseña de Vida del Código
+
 config.webhook_config=Configuración de Webhooks
 config.queue_length=Tamaño de Cola de Envío
 config.deliver_timeout=Timeout de Entrega
 config.skip_tls_verify=Omitir la Verificación TLS
+
 config.mailer_config=Configuración del servidor de correo
 config.mailer_enabled=Activado
 config.mailer_disable_helo=Desactivar HELO
@@ -1024,12 +1034,15 @@ config.mailer_user=Usuario
 config.send_test_mail=Enviar email de prueba
 config.test_mail_failed=Fallo al enviar el email de prueba a '%s': %v
 config.test_mail_sent=El email de prueba ha sido enviado a '%s'.
+
 config.oauth_config=Configuración OAuth
 config.oauth_enabled=Activado
+
 config.cache_config=Configuración de la Caché
 config.cache_adapter=Adaptador de la Caché
 config.cache_interval=Intervalo de la Caché
 config.cache_conn=Conexión de la Caché
+
 config.session_config=Configuración de la Sesión
 config.session_provider=Proveedor de la Sesión
 config.provider_config=Configuración del Proveedor
@@ -1039,9 +1052,24 @@ config.gc_interval_time=Intervalo de tiempo del GC
 config.session_life_time=Tiempo de Vida de la Sesión
 config.https_only=Sólo HTTPS
 config.cookie_life_time=Tiempo de Vida de la Cookie
+
 config.picture_config=Configuración de Imagen
 config.picture_service=Servicio de Imágen
 config.disable_gravatar=Desactivar Gravatar
+config.enable_federated_avatar=Enable Federated Avatars
+
+config.git_config=Git Configuration
+config.git_disable_diff_highlight=Disable Diff Syntax Highlight
+config.git_max_diff_lines=Max Diff Lines (for a single file)
+config.git_max_diff_line_characters=Max Diff Characters (for a single line)
+config.git_max_diff_files=Max Diff Files (to be shown)
+config.git_gc_args=GC Arguments
+config.git_migrate_timeout=Migration Timeout
+config.git_mirror_timeout=Mirror Update Timeout
+config.git_clone_timeout=Clone Operation Timeout
+config.git_pull_timeout=Pull Operation Timeout
+config.git_gc_timeout=GC Operation Timeout
+
 config.log_config=Configuración del Log
 config.log_mode=Modo del Log

--- a/conf/locale/locale_fi-FI.ini
+++ b/conf/locale/locale_fi-FI.ini
@@ -96,6 +96,8 @@ offline_mode=Ota käyttöön Offline tila
 offline_mode_popup=Poista käytöstä CDN myös tuotanto tilassa, kaikki resurssi tiedostot palvellaan paikallisesti.
 disable_gravatar=Poista käytöstä Gravatar palvelu
 disable_gravatar_popup=Poista käytöstä Gravatar ja mukautetut lähteet, kaikki profiilikuvat on käyttäjien palvelimelle lähettämiä tai oletus.
+federated_avatar_lookup=Enable Federated Avatars Lookup
+federated_avatar_lookup_popup=Enable federated avatars lookup to use federated open source service based on libravatar.
 disable_registration=Poista käytöstä itse-rekisteröinti
 disable_registration_popup=Poista käyttäjän itse rekisteröinti, vain ylläpito voi luoda tilejä.
 enable_captcha=Ota käyttöön Captcha
@@ -239,6 +241,7 @@ form.name_pattern_not_allowed=Käyttäjätunnus mallia '%s' ei ole sallittu.
 [settings]
 profile=Profiili
 password=Salasana
+avatar=Avatar
 ssh_keys=SSH avaimet
 social=Sosiaaliset tilit
 applications=Sovellukset
@@ -259,6 +262,8 @@ change_username_prompt=Tämä muutos vaikuttaa tapaan kuinka linkit liittyvät t
 continue=Jatka
 cancel=Peruuta

+lookup_avatar_by_mail=Lookup Avatar by mail
+federated_avatar_lookup=Federated Avatar Lookup
 enable_custom_avatar=Ota käyttöön mukautettu profiilikuva
 choose_new_avatar=Valitse uusi profiilikuva
 update_avatar=Päivitä profiilikuva asetus
@@ -345,7 +350,7 @@ fork_from=Forkkaa lähteestä
 fork_visiblity_helper=Et voi muuttaa forkatun repon näkyvyyttä.
 repo_desc=Kuvaus
 repo_lang=Kieli
-repo_lang_helper=Valitse .gitignore tiedostot
+repo_gitignore_helper=Select .gitignore templates
 license=Lisenssi
 license_helper=Valitse lisenssitiedosto
 readme=Lueminut-tiedosto
@@ -579,11 +584,13 @@ settings.site=Virallinen sivusto
 settings.update_settings=Päivitä asetukset
 settings.change_reponame_prompt=Tämä muutos vaikuttaa siihen miten linkit liittyvät repoon.
 settings.advanced_settings=Lisäasetukset
-settings.wiki_desc=Ota käyttöön wiki salliaksesi ihmisten kirjoittaa asiakirjoja
+settings.wiki_desc=Enable wiki system
+settings.use_internal_wiki=Use builtin wiki
 settings.use_external_wiki=Käytä ulkoista wikiä
 settings.external_wiki_url=Ulkoinen Wiki URL
 settings.external_wiki_url_desc=Vierailijat uudelleenohjataan URL-osoitteeseen kun he klikkaavat välilehteä.
-settings.issues_desc=Ota käyttöön sisäänrakennettu kevyt vikaseuranta
+settings.issues_desc=Enable issue tracker
+settings.use_internal_issue_tracker=Use builtin lightweight issue tracker
 settings.use_external_issue_tracker=Käytä ulkoista vikaseurantaa
 settings.tracker_url_format=Ulkoisen vikaseurannan URL muoto
 settings.tracker_issue_style=External Issue Tracker Naming Style:
@@ -1001,6 +1008,7 @@ config.db_ssl_mode=SSL tila
 config.db_ssl_mode_helper=(vain "postgres")
 config.db_path=Polku
 config.db_path_helper=("sqlite3" ja "tidb")
+
 config.service_config=Palvelu asetukset
 config.register_email_confirm=Vaadi sähköpostivahvistus
 config.disable_register=Poista käytöstä rekisteröinti
@@ -1011,10 +1019,12 @@ config.disable_key_size_check=Poista käytöstä avaimen vähimmäiskoko tarkist
 config.enable_captcha=Ota käyttöön Captcha
 config.active_code_lives=Aktiivinen koodi elämät ennen vanhenemista
 config.reset_password_code_lives=Nollaa salasana koodi elämät
+
 config.webhook_config=Webkoukku asetukset
 config.queue_length=Jonon pituus
 config.deliver_timeout=Toimitus aikakatkaisu
 config.skip_tls_verify=Ohita TLS tarkistaminen
+
 config.mailer_config=Sähköpostipalvelin asetukset
 config.mailer_enabled=Käytössä
 config.mailer_disable_helo=Poista käytöstä HELO
@@ -1024,12 +1034,15 @@ config.mailer_user=Käyttäjä
 config.send_test_mail=Lähetä testi sähköposti
 config.test_mail_failed=Testi sähköpostin lähettäminen vastaanottajalle '%s': %v epäonnistui
 config.test_mail_sent=Testi sähköposti on lähetetty vastaanottajalle '%s'.
+
 config.oauth_config=OAuth asetukset
 config.oauth_enabled=Käytössä
+
 config.cache_config=Välimuistin asetukset
 config.cache_adapter=Välimuistin sovitin
 config.cache_interval=Välimuistin aikaväli
 config.cache_conn=Välimuistin yhteys merkkijono
+
 config.session_config=Istunnon asetukset
 config.session_provider=Istunnon toimittaja
 config.provider_config=Toimittajan asetukset
@@ -1039,9 +1052,24 @@ config.gc_interval_time=GC aikaväli aika
 config.session_life_time=Istunnon elinikä
 config.https_only=Vain HTTPS
 config.cookie_life_time=Evästeen elinikä
+
 config.picture_config=Kuva asetukset
 config.picture_service=Kuva palvelu
 config.disable_gravatar=Poista käytöstä Gravatar
+config.enable_federated_avatar=Enable Federated Avatars
+
+config.git_config=Git Configuration
+config.git_disable_diff_highlight=Disable Diff Syntax Highlight
+config.git_max_diff_lines=Max Diff Lines (for a single file)
+config.git_max_diff_line_characters=Max Diff Characters (for a single line)
+config.git_max_diff_files=Max Diff Files (to be shown)
+config.git_gc_args=GC Arguments
+config.git_migrate_timeout=Migration Timeout
+config.git_mirror_timeout=Mirror Update Timeout
+config.git_clone_timeout=Clone Operation Timeout
+config.git_pull_timeout=Pull Operation Timeout
+config.git_gc_timeout=GC Operation Timeout
+
 config.log_config=Loki asetukset
 config.log_mode=Loki tila

--- a/conf/locale/locale_fr-FR.ini
+++ b/conf/locale/locale_fr-FR.ini
@@ -96,6 +96,8 @@ offline_mode=Activer le mode hors connexion
 offline_mode_popup=Désactiver le CDN, même en production. Toutes les ressources seront distribuées en local.
 disable_gravatar=Désactiver le service Gravatar
 disable_gravatar_popup=Désactiver Gravatar et les sources personnalisées, tous les avatars sont téléchargés par les utilisateurs ou par défaut.
+federated_avatar_lookup=Enable Federated Avatars Lookup
+federated_avatar_lookup_popup=Enable federated avatars lookup to use federated open source service based on libravatar.
 disable_registration=Désactiver le formulaire d'inscription
 disable_registration_popup=Désactiver le formulaire d'inscription, seuls les administrateurs peuvent créer des comptes.
 enable_captcha=Activez le Captcha
@@ -239,6 +241,7 @@ form.name_pattern_not_allowed=Motif '%s' interdit pour les noms d'utilisateur.
 [settings]
 profile=Profil
 password=Mot de Passe
+avatar=Avatar
 ssh_keys=Clés SSH
 social=Réseaux Sociaux
 applications=Applications
@@ -259,6 +262,8 @@ change_username_prompt=Cette modification affectera la manière dont les liens s
 continue=Continuer
 cancel=Annuler

+lookup_avatar_by_mail=Lookup Avatar by mail
+federated_avatar_lookup=Federated Avatar Lookup
 enable_custom_avatar=Activer l'avatar personnalisé
 choose_new_avatar=Sélectionner un nouvel avatar
 update_avatar=Mettre à jour l'avatar
@@ -345,7 +350,7 @@ fork_from=Fork de
 fork_visiblity_helper=La visibilité d'un fork ne peut pas être modifiée.
 repo_desc=Description
 repo_lang=Langue
-repo_lang_helper=Sélectionnez les fichiers .gitignore
+repo_gitignore_helper=Select .gitignore templates
 license=Licence
 license_helper=Sélectionner un fichier de licence
 readme=Fichier Readme
@@ -579,11 +584,13 @@ settings.site=Site officiel
 settings.update_settings=Valider
 settings.change_reponame_prompt=Ce changement affectera comment les liens sont reliés avec le dépôt.
 settings.advanced_settings=Paramètres avancés
-settings.wiki_desc=Activer le wiki pour permettre l'écriture de documents
+settings.wiki_desc=Enable wiki system
+settings.use_internal_wiki=Use builtin wiki
 settings.use_external_wiki=Utiliser un wiki externe
 settings.external_wiki_url=URL Wiki externe
 settings.external_wiki_url_desc=Les visiteurs seront redirigés vers cette URL lorsqu'ils cliqueront sur l'onglet.
-settings.issues_desc=Activer le bug-tracker léger intégré
+settings.issues_desc=Enable issue tracker
+settings.use_internal_issue_tracker=Use builtin lightweight issue tracker
 settings.use_external_issue_tracker=Utiliser un bug-tracker externe
 settings.tracker_url_format=Format d'URL du bug tracker
 settings.tracker_issue_style=Style de nommage des bugs du tracker externe :
@@ -1001,6 +1008,7 @@ config.db_ssl_mode=Mode SSL
 config.db_ssl_mode_helper=("postgres" uniquement)
 config.db_path=Emplacement
 config.db_path_helper=(pour « sqlite3 » et « TIDB »)
+
 config.service_config=Configuration du Service
 config.register_email_confirm=Nécessite une confirmation par e-mail
 config.disable_register=Désactiver les inscriptions
@@ -1011,10 +1019,12 @@ config.disable_key_size_check=Désactiver la vérification de la taille de clé
 config.enable_captcha=Activez le Captcha
 config.active_code_lives=Limites de Code Actif
 config.reset_password_code_lives=Réinitialiser le Mot De Passe des Limites de Code
+
 config.webhook_config=Configuration Webhook
 config.queue_length=Longueur de la file d'attente
 config.deliver_timeout=Expiration d'Envoi
 config.skip_tls_verify=Ne pas vérifier TLS
+
 config.mailer_config=Configuration du service de mail
 config.mailer_enabled=Activé
 config.mailer_disable_helo=Désactiver HELO
@@ -1024,12 +1034,15 @@ config.mailer_user=Utilisateur
 config.send_test_mail=Envoyer courriel de Test
 config.test_mail_failed=Impossible d'envoyer un e-mail de test à '%s': %v
 config.test_mail_sent=Un e-mail de test à été envoyé à '%s'.
+
 config.oauth_config=Configuration OAuth
 config.oauth_enabled=Activé
+
 config.cache_config=Configuration du Cache
 config.cache_adapter=Adaptateur du Cache
 config.cache_interval=Intervales du Cache
 config.cache_conn=Liaison du Cache
+
 config.session_config=Configuration de session
 config.session_provider=Fournisseur de session
 config.provider_config=Configuration du fournisseur
@@ -1039,9 +1052,24 @@ config.gc_interval_time=Intervals GC
 config.session_life_time=Durée des sessions
 config.https_only=HTTPS uniquement
 config.cookie_life_time=Expiration du cookie
+
 config.picture_config=Configuration d'Image
 config.picture_service=Service d'Imagerie
 config.disable_gravatar=Désactiver Gravatar
+config.enable_federated_avatar=Enable Federated Avatars
+
+config.git_config=Git Configuration
+config.git_disable_diff_highlight=Disable Diff Syntax Highlight
+config.git_max_diff_lines=Max Diff Lines (for a single file)
+config.git_max_diff_line_characters=Max Diff Characters (for a single line)
+config.git_max_diff_files=Max Diff Files (to be shown)
+config.git_gc_args=GC Arguments
+config.git_migrate_timeout=Migration Timeout
+config.git_mirror_timeout=Mirror Update Timeout
+config.git_clone_timeout=Clone Operation Timeout
+config.git_pull_timeout=Pull Operation Timeout
+config.git_gc_timeout=GC Operation Timeout
+
 config.log_config=Configuration du Journal
 config.log_mode=Mode du journal

--- a/conf/locale/locale_it-IT.ini
+++ b/conf/locale/locale_it-IT.ini
@@ -96,6 +96,8 @@ offline_mode=Abilita Modalità Offline
 offline_mode_popup=Disabilita il CDN anche in modalità produttiva, tutte le risorse saranno servite localmente.
 disable_gravatar=Disattiva il servizio Gravatar
 disable_gravatar_popup=Disabilita Gravatar e sorgenti customizzate, tutti gli avatar vengono caricati dagli utenti o come predefinito.
+federated_avatar_lookup=Enable Federated Avatars Lookup
+federated_avatar_lookup_popup=Enable federated avatars lookup to use federated open source service based on libravatar.
 disable_registration=Disabilita Registrazione Manuale
 disable_registration_popup=Disabilita la registrazione manuale degli utenti, solo gli amministratori possono creare account.
 enable_captcha=Abilita Captcha
@@ -239,6 +241,7 @@ form.name_pattern_not_allowed=La struttura del nome utente '%s' non è consentit
 [settings]
 profile=Profilo
 password=Password
+avatar=Avatar
 ssh_keys=Chiavi SSH
 social=Account Sociali
 applications=Applicazioni
@@ -259,6 +262,8 @@ change_username_prompt=Questa modifica influenzerà il modo in cui i link si rif
 continue=Continua
 cancel=Annulla

+lookup_avatar_by_mail=Lookup Avatar by mail
+federated_avatar_lookup=Federated Avatar Lookup
 enable_custom_avatar=Abilita avatar personalizzato
 choose_new_avatar=Scegli un nuovo avatar
 update_avatar=Aggiorna le impostazioni avatar
@@ -345,7 +350,7 @@ fork_from=Forka da
 fork_visiblity_helper=Non puoi cambiare la visibilità di un repository forkato.
 repo_desc=Descrizione
 repo_lang=Lingua
-repo_lang_helper=Seleziona file .gitignore
+repo_gitignore_helper=Select .gitignore templates
 license=Licenza
 license_helper=Selezionare un file di licenza
 readme=Readme
@@ -514,7 +519,7 @@ pulls.tab_commits=Commit
 pulls.tab_files=File modificati
 pulls.reopen_to_merge=Riapri questa pull request per effettuare il merge.
 pulls.merged=Unito
-pulls.has_merged=Questa pull reqeust è stata mergiata con successo!
+pulls.has_merged=Questo contributo è stato incluso con successo!
 pulls.data_broken=I dati di questa pull request si sono rotti causa dell'eliminazione delle informazioni di fork.
 pulls.is_checking=Il controllo dei conflitti è ancora in corso, per favore aggiorna pagina tra qualche istante.
 pulls.can_auto_merge_desc=La pull request non può essere mergiata automaticamente.
@@ -579,11 +584,13 @@ settings.site=Sito Ufficiale
 settings.update_settings=Aggiorna Impostazioni
 settings.change_reponame_prompt=Questa modifica influirà i link al repository.
 settings.advanced_settings=Opzioni avanzate
-settings.wiki_desc=Abilitare il wiki per consentire alle persone di scrivere documenti
+settings.wiki_desc=Enable wiki system
+settings.use_internal_wiki=Use builtin wiki
 settings.use_external_wiki=Usa Wiki esterno
 settings.external_wiki_url=URL Wiki esterno
 settings.external_wiki_url_desc=I visitatori verranno reindirizzati all'URL quando cliccano sulla scheda.
-settings.issues_desc=Abilita l'issue tracker builtin leggero
+settings.issues_desc=Enable issue tracker
+settings.use_internal_issue_tracker=Use builtin lightweight issue tracker
 settings.use_external_issue_tracker=Utilizza gestore di problemi esterno
 settings.tracker_url_format=Formato URL Gestore Problemi Esterno
 settings.tracker_issue_style=External Issue Tracker Naming Style:
@@ -1001,6 +1008,7 @@ config.db_ssl_mode=Modalità SSL
 config.db_ssl_mode_helper=(solo per "postgres")
 config.db_path=Percorso
 config.db_path_helper=(per "sqlite3" e "tidb")
+
 config.service_config=Configurazione Servizio
 config.register_email_confirm=Richiedono Conferma dell'Email
 config.disable_register=Disabilita Registrazione
@@ -1011,10 +1019,12 @@ config.disable_key_size_check=Disabilita controllo sulle dimensioni minime della
 config.enable_captcha=Abilita Captcha
 config.active_code_lives=Attiva Vita del Codice
 config.reset_password_code_lives=Reimpostare Password della Vita del Codice
+
 config.webhook_config=Configurazione Webhook
 config.queue_length=Lunghezza della coda
 config.deliver_timeout=Tempo Limite di Consegna
 config.skip_tls_verify=Salta verifiche TLS
+
 config.mailer_config=Configurazione Mailer
 config.mailer_enabled=Attivo
 config.mailer_disable_helo=Disattiva HELO
@@ -1024,12 +1034,15 @@ config.mailer_user=Utente
 config.send_test_mail=Invia email di test
 config.test_mail_failed=Impossibile inviare mail a '%s': %v
 config.test_mail_sent=Una mail di prova è stata inviata a '%s'.
+
 config.oauth_config=Configurazione OAuth
 config.oauth_enabled=Attivo
+
 config.cache_config=Configurazione Cache
 config.cache_adapter=Adattatore Cache
 config.cache_interval=Intervallo Cache
 config.cache_conn=Connessione Cache
+
 config.session_config=Configurazione Sessione
 config.session_provider=Fornitore Sessione
 config.provider_config=Impostazioni Provider
@@ -1039,9 +1052,24 @@ config.gc_interval_time=Intervallo di tempo della GC
 config.session_life_time=Durata Sessione
 config.https_only=Solo HTTPS
 config.cookie_life_time=Durata Cookie
+
 config.picture_config=Configurazione Foto
 config.picture_service=Servizio foto
 config.disable_gravatar=Disabilita Gravatar
+config.enable_federated_avatar=Enable Federated Avatars
+
+config.git_config=Git Configuration
+config.git_disable_diff_highlight=Disable Diff Syntax Highlight
+config.git_max_diff_lines=Max Diff Lines (for a single file)
+config.git_max_diff_line_characters=Max Diff Characters (for a single line)
+config.git_max_diff_files=Max Diff Files (to be shown)
+config.git_gc_args=GC Arguments
+config.git_migrate_timeout=Migration Timeout
+config.git_mirror_timeout=Mirror Update Timeout
+config.git_clone_timeout=Clone Operation Timeout
+config.git_pull_timeout=Pull Operation Timeout
+config.git_gc_timeout=GC Operation Timeout
+
 config.log_config=Configurazione Log
 config.log_mode=Modalità Log

--- a/conf/locale/locale_ja-JP.ini
+++ b/conf/locale/locale_ja-JP.ini
@@ -96,6 +96,8 @@ offline_mode=オフラインモードを有効にする
 offline_mode_popup=プロダクションモードでは、CDNを使用せずにローカルからリソースファイルを使用します。
 disable_gravatar=Gravatarのサービスを無効にします
 disable_gravatar_popup=Gravatarとカスタムソースを無効にして、全てのアバターをユーザーによってアップロードされたものかデフォルトなものにします。
+federated_avatar_lookup=Enable Federated Avatars Lookup
+federated_avatar_lookup_popup=Enable federated avatars lookup to use federated open source service based on libravatar.
 disable_registration=自己登録を無効にする
 disable_registration_popup=自己登録を無効にし、管理者のみがアカウント作成できる
 enable_captcha=Captchaを有効にする
@@ -149,8 +151,8 @@ forget_password=パスワードを忘れましたか？
 sign_up_now=アカウントが必要ですか？今すぐ登録しましょう！
 confirmation_mail_sent_prompt=新しい確認メールを <b>%s</b> に送りました。登録を完了させるために、%d時間以内にあなたのメールボックスを確認してください。
 active_your_account=アカウントを有効化
-prohibit_login=Login Prohibited
-prohibit_login_desc=Your account is prohibited to login, please contact site admin.
+prohibit_login=ログイン禁止
+prohibit_login_desc=あなたのアカウントはログインを禁止されています。サイト管理者にお問い合わせください。
 resent_limit_prompt=申し訳ありませんが、アクティベーションメールは頻繁に送信しています。3 分お待ちください。
 has_unconfirmed_mail=こんにちは %s さん、あなたの電子メール アドレス (<b>%s</b>) は未確認です。もし確認メールをまだ確認できていないか、改めて再送信する場合は、下のボタンをクリックしてください。
 resend_mail=アクティベーションメールを再送信するにはここをクリック
@@ -239,6 +241,7 @@ form.name_pattern_not_allowed=ユーザ名のパターン '%s' は許可され
 [settings]
 profile=プロフィール
 password=パスワード
+avatar=Avatar
 ssh_keys=SSH キー
 social=SNSアカウント
 applications=アプリケーション
@@ -259,6 +262,8 @@ change_username_prompt=この変更はリンクをアカウントに関連付け
 continue=続行
 cancel=キャンセル

+lookup_avatar_by_mail=Lookup Avatar by mail
+federated_avatar_lookup=Federated Avatar Lookup
 enable_custom_avatar=カスタムのアバターを有効にする
 choose_new_avatar=新しいアバターを選択
 update_avatar=アバターの設定を更新
@@ -345,7 +350,7 @@ fork_from=フォーク元
 fork_visiblity_helper=フォークされたリポジトリの可視状態は変更できません。
 repo_desc=説明
 repo_lang=言語
-repo_lang_helper=.gitignoreファイルを選択
+repo_gitignore_helper=Select .gitignore templates
 license=ライセンス
 license_helper=ライセンス ファイルを選択
 readme=Readme
@@ -412,7 +417,7 @@ file_raw=Raw
 file_history=履歴
 file_view_raw=Rawデータを見る
 file_permalink=パーマリンク
-file_too_large=This file is too large to be shown
+file_too_large=このファイルは大きすぎるため、表示できません。

 commits.commits=コミット
 commits.search=コミットの検索
@@ -505,7 +510,7 @@ pulls.compare_compare=比較
 pulls.filter_branch=フィルターブランチ
 pulls.no_results=結果が見つかりませんでした。
 pulls.nothing_to_compare=There is nothing to compare because base and head branches are even.
-pulls.has_pull_request=`There is already a pull request between these two targets: <a href="%[1]s/pulls/%[3]d">%[2]s#%[3]d</a>`
+pulls.has_pull_request=`既にプルリクエストがこれらのターゲット間に存在します: <a href="%[1]s/pulls/%[3]d">%[2]s#%[3]d</a>`
 pulls.create=プルリクエストを作成します。
 pulls.title_desc=wants to merge %[1]d commits from <code>%[2]s</code> into <code>%[3]s</code>
 pulls.merged_title_desc=merged %[1]d commits from <code>%[2]s</code> into <code>%[3]s</code> %[4]s
@@ -579,11 +584,13 @@ settings.site=公式サイト
 settings.update_settings=設定の更新
 settings.change_reponame_prompt=この変更はリンクがリポジトリに関連付ける方法に影響します。
 settings.advanced_settings=拡張設定
-settings.wiki_desc=Wikiでドキュメントの作成を許可
+settings.wiki_desc=Enable wiki system
+settings.use_internal_wiki=Use builtin wiki
 settings.use_external_wiki=外部 wiki を使用します。
 settings.external_wiki_url=外部 Wiki の URL
 settings.external_wiki_url_desc=Visitors will be redirected to URL when they click on the tab.
-settings.issues_desc=組み込み簡易課題トラッカーを有効
+settings.issues_desc=Enable issue tracker
+settings.use_internal_issue_tracker=Use builtin lightweight issue tracker
 settings.use_external_issue_tracker=外部課題トラッキングシステムを使用
 settings.tracker_url_format=外部課題トラッキングツール URLのフォーマット
 settings.tracker_issue_style=External Issue Tracker Naming Style:
@@ -1001,6 +1008,7 @@ config.db_ssl_mode=SSL モード
 config.db_ssl_mode_helper=(「postgres」のみ）
 config.db_path=パス
 config.db_path_helper=(for "sqlite3" and "tidb")
+
 config.service_config=サービスの構成
 config.register_email_confirm=電子メールの確認を必要
 config.disable_register=登録を無効にする
@@ -1011,10 +1019,12 @@ config.disable_key_size_check=最小キー サイズ チェックを無効にし
 config.enable_captcha=Captchaを有効にする
 config.active_code_lives=コードリンクの有効期限をアクティブ
 config.reset_password_code_lives=パスワードリンクの有効期限をリセット
+
 config.webhook_config=Webhook設定
 config.queue_length=キューの長さ
 config.deliver_timeout=送信タイムアウト
 config.skip_tls_verify=TLSの確認を省略
+
 config.mailer_config=メーラーの構成
 config.mailer_enabled=有効にした
 config.mailer_disable_helo=HELOコマンド無効
@@ -1024,12 +1034,15 @@ config.mailer_user=ユーザ
 config.send_test_mail=Send Test Email
 config.test_mail_failed=Fail to send test email to '%s': %v
 config.test_mail_sent=Test email has been sent to '%s'.
+
 config.oauth_config=OAuth 構成
 config.oauth_enabled=Enabled
+
 config.cache_config=キャッシュの構成
 config.cache_adapter=キャッシュ アダプター
 config.cache_interval=キャッシュ間隔
 config.cache_conn=キャッシュ接続
+
 config.session_config=セッションの構成
 config.session_provider=セッション プロバイダー
 config.provider_config=プロバイダーの構成
@@ -1039,9 +1052,24 @@ config.gc_interval_time=GC 間隔
 config.session_life_time=セッションのライフタイム
 config.https_only=HTTPS のみ
 config.cookie_life_time=クッキーのライフタイム
+
 config.picture_config=画像構成
 config.picture_service=画像サービス
 config.disable_gravatar=グラバターを無効にする
+config.enable_federated_avatar=Enable Federated Avatars
+
+config.git_config=Git Configuration
+config.git_disable_diff_highlight=Disable Diff Syntax Highlight
+config.git_max_diff_lines=Max Diff Lines (for a single file)
+config.git_max_diff_line_characters=Max Diff Characters (for a single line)
+config.git_max_diff_files=Max Diff Files (to be shown)
+config.git_gc_args=GC Arguments
+config.git_migrate_timeout=Migration Timeout
+config.git_mirror_timeout=Mirror Update Timeout
+config.git_clone_timeout=Clone Operation Timeout
+config.git_pull_timeout=Pull Operation Timeout
+config.git_gc_timeout=GC Operation Timeout
+
 config.log_config=ログの構成
 config.log_mode=ログ モード

--- a/conf/locale/locale_lv-LV.ini
+++ b/conf/locale/locale_lv-LV.ini
@@ -96,6 +96,8 @@ offline_mode=Iespējot bezsaistes režīmu
 offline_mode_popup=Atspējot CDN arī produkcijas režīmā, visi resursu faili tiks piegādāti no servera.
 disable_gravatar=Atspējot Gravatar pakalpojumu
 disable_gravatar_popup=Atspējot Gravatar un citus avotus, visus avatarus augšupielādēts lietotāji vai izmantos noklusēto attēlu.
+federated_avatar_lookup=Enable Federated Avatars Lookup
+federated_avatar_lookup_popup=Enable federated avatars lookup to use federated open source service based on libravatar.
 disable_registration=Atspējot lietotāju reģistrāciju
 disable_registration_popup=Atspējot lietotāju reģistrāciju, tikai administrators varēs izveidot jaunus lietotāju kontus.
 enable_captcha=Iespējot drošības kodu
@@ -239,6 +241,7 @@ form.name_pattern_not_allowed=Lietotāja vārds '%s' nav atļauts.
 [settings]
 profile=Profils
 password=Parole
+avatar=Avatar
 ssh_keys=SSH atslēgas
 social=Sociālie konti
 applications=Lietotnes
@@ -259,6 +262,8 @@ change_username_prompt=Šī izmaiņa ietekmēs saites, kas norāda uz Jūsu kont
 continue=Turpināt
 cancel=Atcelt

+lookup_avatar_by_mail=Lookup Avatar by mail
+federated_avatar_lookup=Federated Avatar Lookup
 enable_custom_avatar=Iespējot maināmu profila attēlu
 choose_new_avatar=Izvēlēties jaunu profila attēlu
 update_avatar=Saglabāt profila bildi
@@ -345,7 +350,7 @@ fork_from=Atdalīt no
 fork_visiblity_helper=Atdalītam repozitorijam nav iespējams nomainīt tā redzamību
 repo_desc=Apraksts
 repo_lang=Valoda
-repo_lang_helper=Izvēlieties .gitignore failus
+repo_gitignore_helper=Select .gitignore templates
 license=Licence
 license_helper=Izvēlieties licences failu
 readme=LasiMani
@@ -579,11 +584,13 @@ settings.site=Oficiālā mājas lapa
 settings.update_settings=Mainīt iestatījumus
 settings.change_reponame_prompt=Šī izmaiņa ietekmēs saites, kas ir saistītas ar šo repozitoriju.
 settings.advanced_settings=Papildu iestatījumi
-settings.wiki_desc=Iespējot vikivietni, lai atļautu cilvēkiem rakstīt dokumentus
+settings.wiki_desc=Enable wiki system
+settings.use_internal_wiki=Use builtin wiki
 settings.use_external_wiki=Izmantot ārējo vikivietni
 settings.external_wiki_url=Ārējās Vikivietnes adrese
 settings.external_wiki_url_desc=Apmeklētāji tiks novirzīti uz adresi, kad viņi uzklikšķinās uz cilnes.
-settings.issues_desc=Iespējot iebūvētu vieglu problēmu sekotāju
+settings.issues_desc=Enable issue tracker
+settings.use_internal_issue_tracker=Use builtin lightweight issue tracker
 settings.use_external_issue_tracker=Izmantot ārējo problēmu sekotāju
 settings.tracker_url_format=Ārējā problēmu sekotāja adreses formāts
 settings.tracker_issue_style=Ārējā problēmu reģistra nosaukumu stils:
@@ -1001,6 +1008,7 @@ config.db_ssl_mode=SSL režīms
 config.db_ssl_mode_helper=(tikai PostgreSQL datu bāzei)
 config.db_path=Ceļš
 config.db_path_helper=(priekš "sqlite3" and "tidb")
+
 config.service_config=Pakalpojuma konfigurācija
 config.register_email_confirm=Pieprasīt e-pasta apstiprināšanu
 config.disable_register=Atspējot jaunu lietotāju reģistrāciju
@@ -1011,10 +1019,12 @@ config.disable_key_size_check=Atspējot atslēgas minimālā garuma pārbaudi
 config.enable_captcha=Iespējot drošības kodu
 config.active_code_lives=Aktīvā koda ilgums
 config.reset_password_code_lives=Paroles atiestatīšanas koda ilgums
+
 config.webhook_config=Tīkla āķu konfigurācija
 config.queue_length=Rindas garums
 config.deliver_timeout=Piegādes noildze
 config.skip_tls_verify=Izlaist TLS pārbaudi
+
 config.mailer_config=Sūtītāja konfigurācija
 config.mailer_enabled=Iespējots
 config.mailer_disable_helo=Atspējot HELO
@@ -1024,12 +1034,15 @@ config.mailer_user=Lietotājs
 config.send_test_mail=Nosūtīt pārbaudes e-pastu
 config.test_mail_failed=Neizdevās nosūtīt pārbaudes e-pasta vēstuli uz '%s': %v
 config.test_mail_sent=Pārbaudes e-pasta vēstule tika nosūtīta uz '%s'.
+
 config.oauth_config=OAuth konfigurācija
 config.oauth_enabled=Iespējota
+
 config.cache_config=Kešatmiņas konfigurācija
 config.cache_adapter=Kešatmiņas adapteris
 config.cache_interval=Kešatmiņas intervāls
 config.cache_conn=Kešatmiņas pieslēguma parametri
+
 config.session_config=Sesijas konfigurācja
 config.session_provider=Sesijas nodrošinātājs
 config.provider_config=Pakalpojumu sniedzēja konfigurācija
@@ -1039,9 +1052,24 @@ config.gc_interval_time=GC laika intervāls
 config.session_life_time=Sesijas ilgums
 config.https_only=Tikai HTTPS
 config.cookie_life_time=Sīkdatņu glabāšanas ilgums
+
 config.picture_config=Attēlu konfigurācija
 config.picture_service=Lokāli attēli
 config.disable_gravatar=Atspējot Gravatar
+config.enable_federated_avatar=Enable Federated Avatars
+
+config.git_config=Git Configuration
+config.git_disable_diff_highlight=Disable Diff Syntax Highlight
+config.git_max_diff_lines=Max Diff Lines (for a single file)
+config.git_max_diff_line_characters=Max Diff Characters (for a single line)
+config.git_max_diff_files=Max Diff Files (to be shown)
+config.git_gc_args=GC Arguments
+config.git_migrate_timeout=Migration Timeout
+config.git_mirror_timeout=Mirror Update Timeout
+config.git_clone_timeout=Clone Operation Timeout
+config.git_pull_timeout=Pull Operation Timeout
+config.git_gc_timeout=GC Operation Timeout
+
 config.log_config=Žurnalizēšanas konfigurācija
 config.log_mode=Žurnalizēšanas veids

--- a/conf/locale/locale_nl-NL.ini
+++ b/conf/locale/locale_nl-NL.ini
@@ -96,6 +96,8 @@ offline_mode=Off line modus inschakelen
 offline_mode_popup=Schakel CDN uit in productiemodus, alle bestanden worden lokaal aangeboden.
 disable_gravatar=Gravatar Service uitschakelen
 disable_gravatar_popup=Schakel Gravatar en andere bronnen uit, alle avatars worden door gebruikers geüpload of zijn standaard.
+federated_avatar_lookup=Enable Federated Avatars Lookup
+federated_avatar_lookup_popup=Enable federated avatars lookup to use federated open source service based on libravatar.
 disable_registration=Schakel zelfregistratie uit
 disable_registration_popup=Schakel zelfregistratie uit, alleen admins kunnen accounts maken.
 enable_captcha=Inschakelen Captcha
@@ -239,6 +241,7 @@ form.name_pattern_not_allowed=Het gebruikersnaam patroon '%s' is niet toegestaan
 [settings]
 profile=Profiel
 password=Wachtwoord
+avatar=Avatar
 ssh_keys=SSH-sleutels
 social=Sociale netwerk-accounts
 applications=Toepassingen
@@ -259,6 +262,8 @@ change_username_prompt=Deze verandering zal de weg links hebben betrekking op uw
 continue=Doorgaan
 cancel=Annuleren

+lookup_avatar_by_mail=Lookup Avatar by mail
+federated_avatar_lookup=Federated Avatar Lookup
 enable_custom_avatar=Aangepaste avatar inschakelen
 choose_new_avatar=Kies een nieuwe avatar
 update_avatar=Avatar instelling bijwerken
@@ -345,7 +350,7 @@ fork_from=Afsplitsing van
 fork_visiblity_helper=U kunt de zichtbaarheid van een geforkte repository niet aanpassen.
 repo_desc=Omschrijving
 repo_lang=Taal
-repo_lang_helper=Selecteer .gitignore bestanden
+repo_gitignore_helper=Select .gitignore templates
 license=Licentie
 license_helper=Selecteer een licentie bestand
 readme=Leesmij-bestand
@@ -579,11 +584,13 @@ settings.site=Officiële site
 settings.update_settings=Instellingen bewerken
 settings.change_reponame_prompt=Deze verandering zal gevolgen hebben voor hoe links zich verhouden tot de repository.
 settings.advanced_settings=Geavanceerde opties
-settings.wiki_desc=Wiki inschakelen, om mensen documenten te laten schrijven
+settings.wiki_desc=Enable wiki system
+settings.use_internal_wiki=Use builtin wiki
 settings.use_external_wiki=Externe wiki gebruiken
 settings.external_wiki_url=Externe wiki-URL
 settings.external_wiki_url_desc=Bezoekers worden doorgestuurd naar de URL als ze op het tabblad klikken.
-settings.issues_desc=Ingebouwde compacte issuetracker inschakelen
+settings.issues_desc=Enable issue tracker
+settings.use_internal_issue_tracker=Use builtin lightweight issue tracker
 settings.use_external_issue_tracker=Externe issuetracker gebruiken
 settings.tracker_url_format=URL-formaat externe issuetracker
 settings.tracker_issue_style=External Issue Tracker Naming Style:
@@ -1001,6 +1008,7 @@ config.db_ssl_mode=SSL modus
 config.db_ssl_mode_helper=(alleen voor "postgres")
 config.db_path=Pad
 config.db_path_helper=(voor "sqlite3" en "tidb")
+
 config.service_config=Serviceconfiguratie
 config.register_email_confirm=E-mailbevestiging registreren
 config.disable_register=Registratie uitgeschakeld
@@ -1011,10 +1019,12 @@ config.disable_key_size_check=Controle op key-lengte uitschakelen
 config.enable_captcha=CAPTCHA inschakelen
 config.active_code_lives=Actieve Code leven
 config.reset_password_code_lives=Reset wachtwoord Code leven
+
 config.webhook_config=Webhook configuratie
 config.queue_length=Lengte van wachtrij
 config.deliver_timeout=Bezorging verlooptijd
 config.skip_tls_verify=TLS certificaat controle overslaan
+
 config.mailer_config=Mailerconfiguatie
 config.mailer_enabled=Ingeschakeld
 config.mailer_disable_helo=Schakel HELO uit
@@ -1024,12 +1034,15 @@ config.mailer_user=Gebruiker
 config.send_test_mail=Testbericht verzenden
 config.test_mail_failed=Verzending van een testmail naar '%s' is mislukt: %v
 config.test_mail_sent=Test-email is verstuurd naar '%s'.
+
 config.oauth_config=OAuth-configuratie
 config.oauth_enabled=Ingeschakeld
+
 config.cache_config=Cache-configuratie
 config.cache_adapter=Cache-adapter
 config.cache_interval=Cache-interval
 config.cache_conn=Cache-connectie
+
 config.session_config=Sessieconfiguratie
 config.session_provider=Sessieprovider
 config.provider_config=Provider config
@@ -1039,9 +1052,24 @@ config.gc_interval_time=GC interval time
 config.session_life_time=Sessie duur
 config.https_only=Alleen HTTPS
 config.cookie_life_time=Cookie duur leeftijd
+
 config.picture_config=Foto configuratie
 config.picture_service=Foto service
 config.disable_gravatar=Gravatar uitschakelen
+config.enable_federated_avatar=Enable Federated Avatars
+
+config.git_config=Git Configuration
+config.git_disable_diff_highlight=Disable Diff Syntax Highlight
+config.git_max_diff_lines=Max Diff Lines (for a single file)
+config.git_max_diff_line_characters=Max Diff Characters (for a single line)
+config.git_max_diff_files=Max Diff Files (to be shown)
+config.git_gc_args=GC Arguments
+config.git_migrate_timeout=Migration Timeout
+config.git_mirror_timeout=Mirror Update Timeout
+config.git_clone_timeout=Clone Operation Timeout
+config.git_pull_timeout=Pull Operation Timeout
+config.git_gc_timeout=GC Operation Timeout
+
 config.log_config=Logconfiguratie
 config.log_mode=Log-modus

--- a/conf/locale/locale_pl-PL.ini
+++ b/conf/locale/locale_pl-PL.ini
@@ -96,6 +96,8 @@ offline_mode=Włącz tryb offline
 offline_mode_popup=Wyłącz CDN, nawet w trybie produkcyjnym, wszystkie pliki zasobów będą podawane lokalnie.
 disable_gravatar=Wyłącz usługę Gravatar
 disable_gravatar_popup=Wyłącz Gravatar i niestandardowe źrodła, awatary muszą być przesyłane przez użytkowników.
+federated_avatar_lookup=Enable Federated Avatars Lookup
+federated_avatar_lookup_popup=Enable federated avatars lookup to use federated open source service based on libravatar.
 disable_registration=Wyłącz samodzielną rejestrację
 disable_registration_popup=Wyłącz samodzielną rejestrację użytkownika, tylko administrator będzie mógł tworzyć konta.
 enable_captcha=Włącz Captcha
@@ -239,6 +241,7 @@ form.name_pattern_not_allowed=Wzorzec nazwy użytkownika "%s" jest niedozwolony.
 [settings]
 profile=Profil
 password=Hasło
+avatar=Avatar
 ssh_keys=Klucze SSH
 social=Konta społecznościowe
 applications=Aplikacje
@@ -259,6 +262,8 @@ change_username_prompt=Ta zmiana wpłynie na sposób w jaki łącza odnoszą si
 continue=Kontynuuj
 cancel=Anuluj

+lookup_avatar_by_mail=Lookup Avatar by mail
+federated_avatar_lookup=Federated Avatar Lookup
 enable_custom_avatar=Włącz niestandardowe awatary
 choose_new_avatar=Wybierz nowy avatar
 update_avatar=Zaktualizuj ustawienia awatara
@@ -345,7 +350,7 @@ fork_from=Forkuj z
 fork_visiblity_helper=Fork nie może zmieniać swojej widoczności
 repo_desc=Opis
 repo_lang=Język
-repo_lang_helper=Wybierz pliki .gitignore
+repo_gitignore_helper=Select .gitignore templates
 license=Licencja
 license_helper=Wybierz plik licencji
 readme=Readme
@@ -579,11 +584,13 @@ settings.site=Oficjalna Strona
 settings.update_settings=Aktualizuj ustawienia
 settings.change_reponame_prompt=Zmiana nazwy repozytorium wpłynie na linki do niego.
 settings.advanced_settings=Ustawienia zaawansowane
-settings.wiki_desc=Włączenie Wiki pozwoli innym pisać dokumenty
+settings.wiki_desc=Enable wiki system
+settings.use_internal_wiki=Use builtin wiki
 settings.use_external_wiki=Użyj zewnętrznego Wiki
 settings.external_wiki_url=Adres URL zewnętrznego Wiki
 settings.external_wiki_url_desc=Odwiedzający zostaną przekierowani do adresu URL po kliknięciu zakładki.
-settings.issues_desc=Włącz wbudowany lekki system zgłaszania problemów
+settings.issues_desc=Enable issue tracker
+settings.use_internal_issue_tracker=Use builtin lightweight issue tracker
 settings.use_external_issue_tracker=Użyj zewnętrznego systemu zgłaszania problemów
 settings.tracker_url_format=Format dla adresu URL zewnętrznego systemu
 settings.tracker_issue_style=Styl nazw zewnętrznego systemu zgłaszania problemów:
@@ -1001,6 +1008,7 @@ config.db_ssl_mode=Tryb SSL
 config.db_ssl_mode_helper=(tylko dla "postgres")
 config.db_path=Ścieżka
 config.db_path_helper=(dla "sqlite3" i "tidb")
+
 config.service_config=Konfiguracja usługi
 config.register_email_confirm=Wymagaj potwierdzenia e-mail
 config.disable_register=Wyłącz rejestrację
@@ -1011,10 +1019,12 @@ config.disable_key_size_check=Wyłącz sprawdzanie minimalnego rozmiaru klucza
 config.enable_captcha=Włącz Captcha
 config.active_code_lives=Ważność kodów aktywacyjnych
 config.reset_password_code_lives=Czas życia kodu resetowania hasła
+
 config.webhook_config=Konfiguracja webhooka
 config.queue_length=Długość kolejki
 config.deliver_timeout=Limit czasu zdarzenia
 config.skip_tls_verify=Pomiń weryfikację protokołu TLS
+
 config.mailer_config=Konfiguracja poczty
 config.mailer_enabled=Aktywne
 config.mailer_disable_helo=Wyłącz HELO
@@ -1024,12 +1034,15 @@ config.mailer_user=Użytkownik
 config.send_test_mail=Wyślij email testowy
 config.test_mail_failed=Nieudane wysłanie wiadomości email do '%s': %v
 config.test_mail_sent=Testowa wiadomość email została wysłana do '%s'.
+
 config.oauth_config=Konfiguracja OAuth
 config.oauth_enabled=Aktywne
+
 config.cache_config=Konfiguracja cache
 config.cache_adapter=Adapter cache
 config.cache_interval=Interwał pamięci podręcznej
 config.cache_conn=Połączenie z pamięcią podręczną
+
 config.session_config=Konfiguracja sesji
 config.session_provider=Dostawca sesji
 config.provider_config=Konfiguracja dostawcy
@@ -1039,9 +1052,24 @@ config.gc_interval_time=Interwał odśmiecania
 config.session_life_time=Czas życia sesji
 config.https_only=Tylko HTTPS
 config.cookie_life_time=Czas życia ciasteczka
+
 config.picture_config=Ustawienia obrazów
 config.picture_service=Serwis obrazów
 config.disable_gravatar=Wyłącz Gravatara
+config.enable_federated_avatar=Enable Federated Avatars
+
+config.git_config=Git Configuration
+config.git_disable_diff_highlight=Disable Diff Syntax Highlight
+config.git_max_diff_lines=Max Diff Lines (for a single file)
+config.git_max_diff_line_characters=Max Diff Characters (for a single line)
+config.git_max_diff_files=Max Diff Files (to be shown)
+config.git_gc_args=GC Arguments
+config.git_migrate_timeout=Migration Timeout
+config.git_mirror_timeout=Mirror Update Timeout
+config.git_clone_timeout=Clone Operation Timeout
+config.git_pull_timeout=Pull Operation Timeout
+config.git_gc_timeout=GC Operation Timeout
+
 config.log_config=Konfiguracja dziennika
 config.log_mode=Tryb dziennika

--- a/conf/locale/locale_pt-BR.ini
+++ b/conf/locale/locale_pt-BR.ini
@@ -96,6 +96,8 @@ offline_mode=Ativar modo off-line
 offline_mode_popup=Desative o CDN mesmo em modo de produção, todos os recursos serão disponibilizados localmente.
 disable_gravatar=Desativar serviço Gravatar
 disable_gravatar_popup=Desabilitar o Gravatar e fontes personalizadas, todos os avatares são enviados por usuários ou padrão.
+federated_avatar_lookup=Enable Federated Avatars Lookup
+federated_avatar_lookup_popup=Enable federated avatars lookup to use federated open source service based on libravatar.
 disable_registration=Desativar auto-registro
 disable_registration_popup=Desativar o auto-registro de usuário, para que somente o administrador possa criar contas.
 enable_captcha=Habilitar captcha
@@ -124,7 +126,7 @@ uname_holder=Nome de Usuário ou E-mail
 password_holder=Senha
 switch_dashboard_context=Trocar Contexto do Painel de Controle
 my_repos=Meus Repositórios
-show_more_repos=Show more repositories...
+show_more_repos=Mostrar mais repositórios...
 collaborative_repos=Repositórios Colaborativos
 my_orgs=Minhas Organizações
 my_mirrors=Meus Espelhos
@@ -239,6 +241,7 @@ form.name_pattern_not_allowed=Não é permitido usar o padrão '%s' para o nome
 [settings]
 profile=Perfil
 password=Senha
+avatar=Avatar
 ssh_keys=Chaves SSH
 social=Contas Sociais
 applications=Aplicativos
@@ -259,6 +262,8 @@ change_username_prompt=Essa alteração afetará os links para a sua conta.
 continue=Continuar
 cancel=Cancelar

+lookup_avatar_by_mail=Lookup Avatar by mail
+federated_avatar_lookup=Federated Avatar Lookup
 enable_custom_avatar=Habilitar Avatar Customizado
 choose_new_avatar=Escolha um novo avatar
 update_avatar=Atualizar configuração de Avatar
@@ -345,7 +350,7 @@ fork_from=Fork de
 fork_visiblity_helper=Não é possível alterar a visibilidade de um repositório forkado.
 repo_desc=Descrição
 repo_lang=Linguagem
-repo_lang_helper=Selecione arquivos .gitignore
+repo_gitignore_helper=Select .gitignore templates
 license=Licença
 license_helper=Selecione um arquivo de licença
 readme=Leia-me
@@ -466,8 +471,8 @@ issues.next=Próxima página
 issues.open_title=aberto
 issues.closed_title=fechado
 issues.num_comments=%d comentários
-issues.commented_at=`commented <a href="#%s">%s</a>`
-issues.delete_comment_confirm=Are you sure you want to delete this comment?
+issues.commented_at=`comentado <a href="#%s">%s</a>`
+issues.delete_comment_confirm=Tem certeza que deseja deletar este comentário?
 issues.no_content=Nenhum conteúdo textual.
 issues.close_issue=Fechar
 issues.close_comment_issue=Comentar e fechar
@@ -579,16 +584,18 @@ settings.site=Site Oficial
 settings.update_settings=Atualizar configurações
 settings.change_reponame_prompt=Este mudanças vai afetar os links para este repositório.
 settings.advanced_settings=Configurações avançadas
-settings.wiki_desc=Habilitar o wiki para permitir que as pessoas escrevam documentos
+settings.wiki_desc=Enable wiki system
+settings.use_internal_wiki=Use builtin wiki
 settings.use_external_wiki=Usar wiki externa
 settings.external_wiki_url=URL externa da wiki
 settings.external_wiki_url_desc=Os visitantes serão redirecionados para a URL quando clicarem na aba.
-settings.issues_desc=Habilitar gerenciamento de "problemas" nativo
+settings.issues_desc=Enable issue tracker
+settings.use_internal_issue_tracker=Use builtin lightweight issue tracker
 settings.use_external_issue_tracker=Usar issue tracker externo
 settings.tracker_url_format=Formato de URL do issue tracker externo
 settings.tracker_issue_style=Estilo de nome de issue tracker externo:
-settings.tracker_issue_style.numeric=Numeric
-settings.tracker_issue_style.alphanumeric=Alphanumeric
+settings.tracker_issue_style.numeric=Numérico
+settings.tracker_issue_style.alphanumeric=Alfanumérico
 settings.tracker_url_format_desc=Você pode usar o espaço reservado <code>{user} {repo} {index}</code> para o nome do usuário, índice de nome e a questão do repositório.
 settings.pulls_desc=Habilitar pull requests para aceitar contribuições públicas
 settings.danger_zone=Zona de Perigo
@@ -727,7 +734,7 @@ release.deletion=Deleção de versão
 release.deletion_desc=Deletar esta versão vai deletar a tag do git correspondente. Você deseja continuar?
 release.deletion_success=A versão foi deletada com sucesso!
 release.tag_name_already_exist=Já existiu versão com esse nome de tag.
-release.tag_name_invalid=Tag name is not valid.
+release.tag_name_invalid=Nome de tag não é válido.
 release.downloads=Downloads

 [org]
@@ -1001,6 +1008,7 @@ config.db_ssl_mode=Modo SSL
 config.db_ssl_mode_helper=(apenas para "postgres")
 config.db_path=Caminho
 config.db_path_helper=(para "sqlite3" e "tidb")
+
 config.service_config=Configuração do Serviço
 config.register_email_confirm=Requerer Confirmação de E-mail
 config.disable_register=Desabilitar Registro
@@ -1011,10 +1019,12 @@ config.disable_key_size_check=Desativar verificação de tamanho mínimo da chav
 config.enable_captcha=Habilitar o Captcha
 config.active_code_lives=Ativar Code Lives
 config.reset_password_code_lives=Redefinir Senha de Code Lives
+
 config.webhook_config=Configuração de Hook da Web
 config.queue_length=Tamanho da fila
 config.deliver_timeout=Intervalo de Entrega
 config.skip_tls_verify=Pular Verificar TLS
+
 config.mailer_config=Configuração de Correio
 config.mailer_enabled=Habilitado
 config.mailer_disable_helo=Desabilitar HELO
@@ -1024,12 +1034,15 @@ config.mailer_user=Usuário
 config.send_test_mail=Enviar email de teste
 config.test_mail_failed=Falha ao enviar o email de teste para '%s': %v
 config.test_mail_sent=O email de teste foi enviado para '%s'.
+
 config.oauth_config=Configuração do OAuth
 config.oauth_enabled=Habilitado
+
 config.cache_config=Configuração de Cache
 config.cache_adapter=Adaptador de Cache
 config.cache_interval=Intervalo de Cache
 config.cache_conn=Conexão de Cache
+
 config.session_config=Configuração da Sessão
 config.session_provider=Provedor da Sessão
 config.provider_config=Configuração do Provedor
@@ -1039,9 +1052,24 @@ config.gc_interval_time=Tempo de Intervalo do GC
 config.session_life_time=Tempo de Vida da Sessão
 config.https_only=Apenas HTTPS
 config.cookie_life_time=Tempo de Vida do Cookie
+
 config.picture_config=Configuração da Imagem
 config.picture_service=Serviço de Imagens
 config.disable_gravatar=Desativar Gravatar
+config.enable_federated_avatar=Enable Federated Avatars
+
+config.git_config=Git Configuration
+config.git_disable_diff_highlight=Disable Diff Syntax Highlight
+config.git_max_diff_lines=Max Diff Lines (for a single file)
+config.git_max_diff_line_characters=Max Diff Characters (for a single line)
+config.git_max_diff_files=Max Diff Files (to be shown)
+config.git_gc_args=GC Arguments
+config.git_migrate_timeout=Migration Timeout
+config.git_mirror_timeout=Mirror Update Timeout
+config.git_clone_timeout=Clone Operation Timeout
+config.git_pull_timeout=Pull Operation Timeout
+config.git_gc_timeout=GC Operation Timeout
+
 config.log_config=Configuração de Log
 config.log_mode=Modo do Log

--- a/conf/locale/locale_ru-RU.ini
+++ b/conf/locale/locale_ru-RU.ini
@@ -96,6 +96,8 @@ offline_mode=Включение офлайн режима
 offline_mode_popup=Отключить CDN даже в производственном режиме, все файлы ресурсов будут раздаваться локально.
 disable_gravatar=Отключить службу Gravatar
 disable_gravatar_popup=Отключить Gravatar и пользовательские источники, все аватары по-умолчанию загружаются пользователями.
+federated_avatar_lookup=Enable Federated Avatars Lookup
+federated_avatar_lookup_popup=Enable federated avatars lookup to use federated open source service based on libravatar.
 disable_registration=Отключить самостоятельную регистрацию
 disable_registration_popup=Запретить пользователям самостоятельную регистрацию, только администратор может создавать аккаунты.
 enable_captcha=Включить капчу
@@ -239,6 +241,7 @@ form.name_pattern_not_allowed=Имя пользователя «%s» не доп
 [settings]
 profile=Профиль
 password=Пароль
+avatar=Avatar
 ssh_keys=SSH ключи
 social=Учетные записи в соцсетях
 applications=Приложения
@@ -259,6 +262,8 @@ change_username_prompt=Это изменение может повлечь за
 continue=Далее
 cancel=Отмена

+lookup_avatar_by_mail=Lookup Avatar by mail
+federated_avatar_lookup=Federated Avatar Lookup
 enable_custom_avatar=Включить собственный аватар
 choose_new_avatar=Выбрать новый аватар
 update_avatar=Обновить настройку аватара
@@ -345,7 +350,7 @@ fork_from=Ответвление от
 fork_visiblity_helper=Ответвленному репозиторию нельзя поменять уровень видимости
 repo_desc=Описание
 repo_lang=Язык
-repo_lang_helper=Выберите файлы .gitignore
+repo_gitignore_helper=Select .gitignore templates
 license=Лицензия
 license_helper=Выберите файл лицензии
 readme=Readme
@@ -579,11 +584,13 @@ settings.site=Официальный сайт
 settings.update_settings=Обновить настройки
 settings.change_reponame_prompt=Это изменение повлияет на отношения ссылок к этому репозиторию.
 settings.advanced_settings=Расширенные настройки
-settings.wiki_desc=Включить Вики, чтобы позволить людям писать документы
+settings.wiki_desc=Enable wiki system
+settings.use_internal_wiki=Use builtin wiki
 settings.use_external_wiki=Использовать внешнюю Wiki
 settings.external_wiki_url=URL-адрес внешней Вики
 settings.external_wiki_url_desc=Посетители будут перенаправлены на URL-адрес, когда они кликнут по вкладке.
-settings.issues_desc=Включить встроенную, легковесную систему отслеживания ошибок
+settings.issues_desc=Enable issue tracker
+settings.use_internal_issue_tracker=Use builtin lightweight issue tracker
 settings.use_external_issue_tracker=Использовать внешнюю систему отслеживания ошибок
 settings.tracker_url_format=Внешний формат ссылки системы отслеживания ошибок.
 settings.tracker_issue_style=Стиль Именования Внешней Системы Учета Задач:
@@ -1001,6 +1008,7 @@ config.db_ssl_mode=Режим SSL
 config.db_ssl_mode_helper=(только для «postgres»)
 config.db_path=Путь
 config.db_path_helper=(для "SQLite3" и "TiDB")
+
 config.service_config=Сервисная конфигурация
 config.register_email_confirm=Требуется подтверждение по электронной почте
 config.disable_register=Отключить регистрацию
@@ -1011,10 +1019,12 @@ config.disable_key_size_check=Отключить проверку на мини
 config.enable_captcha=Включить капчу
 config.active_code_lives=Время жизни кода для активации
 config.reset_password_code_lives=Время жизни кода сброса пароля
+
 config.webhook_config=Настройка автоматического обновления репозиции
 config.queue_length=Длина очереди
 config.deliver_timeout=Задержка доставки
 config.skip_tls_verify=Пропустить TLS проверка
+
 config.mailer_config=Настройки почты
 config.mailer_enabled=Включено
 config.mailer_disable_helo=Отключить HELO
@@ -1024,12 +1034,15 @@ config.mailer_user=Пользователь
 config.send_test_mail=Отправить тестовое письмо
 config.test_mail_failed=Не удалось отправить тестовое письмо «%s»: %v
 config.test_mail_sent=Тестовое письмо было отправлено «%s».
+
 config.oauth_config=Конфигурация OAuth
 config.oauth_enabled=Включено
+
 config.cache_config=Настройки кеша
 config.cache_adapter=Адаптер кэша
 config.cache_interval=Интервал кэширования
 config.cache_conn=Подключение кэша
+
 config.session_config=Конфигурация сессии
 config.session_provider=Провайдер сессии
 config.provider_config=Конфигурация провайдера
@@ -1039,9 +1052,24 @@ config.gc_interval_time=Интервал работы сборщика мусо
 config.session_life_time=Время жизни сессии
 config.https_only=Только HTTPS
 config.cookie_life_time=Время жизни файла cookie
+
 config.picture_config=Настройка изображения
 config.picture_service=Сервис изображений
 config.disable_gravatar=Отключить Gravatar
+config.enable_federated_avatar=Enable Federated Avatars
+
+config.git_config=Git Configuration
+config.git_disable_diff_highlight=Disable Diff Syntax Highlight
+config.git_max_diff_lines=Max Diff Lines (for a single file)
+config.git_max_diff_line_characters=Max Diff Characters (for a single line)
+config.git_max_diff_files=Max Diff Files (to be shown)
+config.git_gc_args=GC Arguments
+config.git_migrate_timeout=Migration Timeout
+config.git_mirror_timeout=Mirror Update Timeout
+config.git_clone_timeout=Clone Operation Timeout
+config.git_pull_timeout=Pull Operation Timeout
+config.git_gc_timeout=GC Operation Timeout
+
 config.log_config=Конфигурация журнала
 config.log_mode=Режим журналирования

--- a/conf/locale/locale_tr-TR.ini
+++ b/conf/locale/locale_tr-TR.ini
@@ -96,6 +96,8 @@ offline_mode=Çevrim Dışı Modu Etkinleştir
 offline_mode_popup=CDN'i, üretim modunda bile devre dışı bırak, tüm kaynak dosyaları yerel olarak sunulacaktır.
 disable_gravatar=Gravatar Servisini Devre Dışı Bırak
 disable_gravatar_popup=Gravatar ve özel kaynakları devre dışı bırak. Tüm avatarlar kullanıcılar tarafından yüklenir veya varsayılan kalır.
+federated_avatar_lookup=Enable Federated Avatars Lookup
+federated_avatar_lookup_popup=Enable federated avatars lookup to use federated open source service based on libravatar.
 disable_registration=Kendi Kendine Kaydolmayı Devre Dışı Bırak
 disable_registration_popup=Kullanıcının kendi kendine kaydolmasını devre dışı bırak, yalnızca yönetici yeni hesaplar oluşturabilir.
 enable_captcha=Captcha'yı Etkinleştir
@@ -239,6 +241,7 @@ form.name_pattern_not_allowed=Kullanıcı adında '%s' modeline izin verilmez.
 [settings]
 profile=Profil
 password=Parola
+avatar=Avatar
 ssh_keys=SSH Anahtarları
 social=Sosyal Medya Hesapları
 applications=Uygulamalar
@@ -259,6 +262,8 @@ change_username_prompt=Bu değişiklik, hesabınızla ilişkili olan bağlantıl
 continue=Devam Et
 cancel=İptal

+lookup_avatar_by_mail=Lookup Avatar by mail
+federated_avatar_lookup=Federated Avatar Lookup
 enable_custom_avatar=Özel Avatarı Etkinleştir
 choose_new_avatar=Yeni Avatar Seç
 update_avatar=Avatar Ayarlarını Güncelle
@@ -345,7 +350,7 @@ fork_from=Buradan Çatalla
 fork_visiblity_helper=Çatallanmış bir deponun görünürlüğünü değiştiremezsiniz.
 repo_desc=Açıklama
 repo_lang=Dil
-repo_lang_helper=.gitignore dosyalarını seçin
+repo_gitignore_helper=Select .gitignore templates
 license=Lisans
 license_helper=Bir lisans dosyası seçin
 readme=Benioku
@@ -466,7 +471,7 @@ issues.next=Sonraki
 issues.open_title=Açık
 issues.closed_title=Kapalı
 issues.num_comments=%d yorum
-issues.commented_at=`commented <a href="#%s">%s</a>`
+issues.commented_at=`<a href="#%s">%s</a> olarak yorumlandı`
 issues.delete_comment_confirm=Bu yorumu silmek istediğinizden emin misiniz?
 issues.no_content=Henüz bir içerik yok.
 issues.close_issue=Kapat
@@ -569,8 +574,8 @@ settings=Ayarlar
 settings.options=Tercihler
 settings.collaboration=İş birliği
 settings.collaboration.admin=Yönetici
-settings.collaboration.write=Write
-settings.collaboration.read=Read
+settings.collaboration.write=Yaz
+settings.collaboration.read=Oku
 settings.collaboration.undefined=Belirsiz
 settings.hooks=Web İstekleri
 settings.githooks=Git İstekleri
@@ -579,11 +584,13 @@ settings.site=Resmi Web Sitesi
 settings.update_settings=Ayarları Güncelle
 settings.change_reponame_prompt=Bu değişiklik, bağlantıların depoyla olan ilişkisini etkileyecektir.
 settings.advanced_settings=Gelişmiş Ayarlar
-settings.wiki_desc=İnsanların belge yazması için Wiki'yi etkinleştir
+settings.wiki_desc=Enable wiki system
+settings.use_internal_wiki=Use builtin wiki
 settings.use_external_wiki=Harici Wiki kullan
 settings.external_wiki_url=Harici Wiki bağlantısı
 settings.external_wiki_url_desc=Ziyaretçiler, sekmeye tıkladıklarında bağlantıya yönlendirilecektir.
-settings.issues_desc=Hazır gelen hafif sorun takipçisini etkinleştir
+settings.issues_desc=Enable issue tracker
+settings.use_internal_issue_tracker=Use builtin lightweight issue tracker
 settings.use_external_issue_tracker=Harici sorun takipçisi kullan
 settings.tracker_url_format=Harici Sorun Takipçisi Bağlantı Formatı
 settings.tracker_issue_style=Harici Hata İzleyicisi Adlandırma Stili:
@@ -695,7 +702,7 @@ diff.show_unified_view=Birleşik Görünüm
 diff.stats_desc=<strong> %d değiştirilmiş dosya</strong> ile <strong>%d ekleme</strong> ve <strong>%d silme</strong>
 diff.bin=BIN
 diff.view_file=Dosyayı Görüntüle
-diff.file_suppressed=File diff suppressed because it is too large
+diff.file_suppressed=Dosya farkı çok büyük olduğundan ihmal edildi
 diff.too_many_files=Bu fark içinde çok fazla dosya değişikliği olduğu için bazı dosyalar gösterilmiyor

 release.releases=Sürümler
@@ -1001,6 +1008,7 @@ config.db_ssl_mode=SSL Biçimi
 config.db_ssl_mode_helper=(sadece "postgres" için)
 config.db_path=Yol
 config.db_path_helper=("sqlite3" ve "tidb" için)
+
 config.service_config=Servis Yapılandırması
 config.register_email_confirm=E-posta Onayı Gerekli
 config.disable_register=Kaydolma Hizmet Dışı
@@ -1011,10 +1019,12 @@ config.disable_key_size_check=Minimum Anahtar Uzunluğu Kontrolünü Devre Dış
 config.enable_captcha=Captcha'yı Aktifleştir
 config.active_code_lives=Kod Yaşamlarını Aktifleştir
 config.reset_password_code_lives=Kod Yaşamları Parolasını Yenile
+
 config.webhook_config=Web İstekleri Yapılandırması
 config.queue_length=Kuyruk Uzunluğu
 config.deliver_timeout=Dağıtım Zaman Aşımı
 config.skip_tls_verify=TLS Doğrulamasını Atla
+
 config.mailer_config=Mailer Yapılandırması
 config.mailer_enabled=Aktif
 config.mailer_disable_helo=HELO'yu Devre Dışı Bırak
@@ -1024,12 +1034,15 @@ config.mailer_user=Kullanıcı
 config.send_test_mail=Test E-Postası Gönder
 config.test_mail_failed='%s' adresine test e-postası gönderimi başarısız: %v
 config.test_mail_sent='%s' adresine test e-postası gönderildi.
+
 config.oauth_config=OAuth Yapılandırması
 config.oauth_enabled=Aktif
+
 config.cache_config=Önbellek Yapılandırması
 config.cache_adapter=Önbellek Uyarlayıcısı
 config.cache_interval=Önbellek Aralığı
 config.cache_conn=Önbellek Bağlantısı
+
 config.session_config=Oturum Yapılandırması
 config.session_provider=Oturum Sağlayıcı
 config.provider_config=Sağlayıcı Yapılandırması
@@ -1039,9 +1052,24 @@ config.gc_interval_time=GC Aralık Zamanı
 config.session_life_time=Oturum Yaşam Zamanı
 config.https_only=Yalnız HTTPS
 config.cookie_life_time=Çerez Yaşam Zamanı
+
 config.picture_config=Resim Yapılandırması
 config.picture_service=Resim Servisi
 config.disable_gravatar=Gravatar Hizmet Dışı
+config.enable_federated_avatar=Enable Federated Avatars
+
+config.git_config=Git Configuration
+config.git_disable_diff_highlight=Disable Diff Syntax Highlight
+config.git_max_diff_lines=Max Diff Lines (for a single file)
+config.git_max_diff_line_characters=Max Diff Characters (for a single line)
+config.git_max_diff_files=Max Diff Files (to be shown)
+config.git_gc_args=GC Arguments
+config.git_migrate_timeout=Migration Timeout
+config.git_mirror_timeout=Mirror Update Timeout
+config.git_clone_timeout=Clone Operation Timeout
+config.git_pull_timeout=Pull Operation Timeout
+config.git_gc_timeout=GC Operation Timeout
+
 config.log_config=Log Yapılandırması
 config.log_mode=Log Modu

--- a/conf/locale/locale_zh-CN.ini
+++ b/conf/locale/locale_zh-CN.ini
@@ -96,6 +96,8 @@ offline_mode=启用离线模式
 offline_mode_popup=在部署模式下也禁用从 CDN 获取文件，所以的资源都将从本地服务器获取。
 disable_gravatar=禁用 Gravatar 服务
 disable_gravatar_popup=禁用 Gravatar 和自定义源，仅使用由用户上传的或默认的头像。
+federated_avatar_lookup=启用 Federated Avatars 查找
+federated_avatar_lookup_popup=启用 Federated Avatars 查找以使用开源的 Libravatar 服务。
 disable_registration=禁止用户自主注册
 disable_registration_popup=禁止用户自行注册功能，只有管理员可以添加帐号。
 enable_captcha=启用验证码服务
@@ -239,6 +241,7 @@ form.name_pattern_not_allowed=用户名不允许 '%s' 的格式。
 [settings]
 profile=个人信息
 password=修改密码
+avatar=头像设置
 ssh_keys=管理 SSH 密钥
 social=社交帐号绑定
 applications=管理授权应用
@@ -259,6 +262,8 @@ change_username_prompt=该操作将会影响到所有与您帐户有关的链接
 continue=继续操作
 cancel=取消操作

+lookup_avatar_by_mail=通过邮箱地址获取头像
+federated_avatar_lookup=Federated Avatar 查找
 enable_custom_avatar=启动自定义头像
 choose_new_avatar=选择新的头像
 update_avatar=更新头像设置
@@ -345,7 +350,7 @@ fork_from=派生自
 fork_visiblity_helper=派生仓库无法修改可见性
 repo_desc=仓库描述
 repo_lang=仓库语言
-repo_lang_helper=请选择 .gitignore 文件
+repo_gitignore_helper=选择 .gitignore 模板
 license=授权许可
 license_helper=请选择授权许可文件
 readme=自述文档
@@ -579,11 +584,13 @@ settings.site=官方网站
 settings.update_settings=更新仓库设置
 settings.change_reponame_prompt=该操作将会影响到所有与该仓库有关的链接
 settings.advanced_settings=高级设置
-settings.wiki_desc=启用 Wiki 以允许用户协作文档
+settings.wiki_desc=启用 Wiki 系统
+settings.use_internal_wiki=使用内置 Wiki 系统
 settings.use_external_wiki=使用外部 Wiki
 settings.external_wiki_url=外部 Wiki 链接
 settings.external_wiki_url_desc=当访问者单击分页标签时，将会被重定向到该链接。
-settings.issues_desc=启用内置的轻量级工单管理系统
+settings.issues_desc=启用工单管理系统
+settings.use_internal_issue_tracker=使用内置的轻量级工单管理系统
 settings.use_external_issue_tracker=使用外部的工单管理系统
 settings.tracker_url_format=外部工单管理系统的 URL 格式
 settings.tracker_issue_style=外部工单管理系统命名风格：
@@ -1001,6 +1008,7 @@ config.db_ssl_mode=SSL 模式
 config.db_ssl_mode_helper=（仅限 "postgres" 使用）
 config.db_path=数据库路径
 config.db_path_helper=（用于 "sqlite3" 和 "tidb"）
+
 config.service_config=服务配置
 config.register_email_confirm=注册邮件确认
 config.disable_register=关闭注册功能
@@ -1011,10 +1019,12 @@ config.disable_key_size_check=禁用密钥最小长度检查
 config.enable_captcha=启用验证码服务
 config.active_code_lives=激活用户链接有效期
 config.reset_password_code_lives=重置密码链接有效期
+
 config.webhook_config=Web 钩子配置
 config.queue_length=队列长度
 config.deliver_timeout=推送超时
 config.skip_tls_verify=忽略 TLS 验证
+
 config.mailer_config=邮件配置
 config.mailer_enabled=启用服务
 config.mailer_disable_helo=禁用 HELO 操作
@@ -1024,12 +1034,15 @@ config.mailer_user=发送者帐号
 config.send_test_mail=发送测试邮件
 config.test_mail_failed=发送测试邮件至 '%s' 时失败：%v
 config.test_mail_sent=测试邮件已经发送至 '%s'。
+
 config.oauth_config=社交帐号配置
 config.oauth_enabled=启用服务
+
 config.cache_config=Cache 配置
 config.cache_adapter=Cache 适配器
 config.cache_interval=Cache 周期
 config.cache_conn=Cache 连接字符串
+
 config.session_config=Session 配置
 config.session_provider=Session 提供者
 config.provider_config=提供者配置
@@ -1039,9 +1052,24 @@ config.gc_interval_time=GC 周期
 config.session_life_time=Session 生命周期
 config.https_only=仅限 HTTPS
 config.cookie_life_time=Cookie 生命周期
+
 config.picture_config=图片配置
 config.picture_service=图片服务
 config.disable_gravatar=禁用 Gravatar 头像
+config.enable_federated_avatar=启用 Federated Avatars
+
+config.git_config=Git 配置
+config.git_disable_diff_highlight=禁用差异对比语法高亮
+config.git_max_diff_lines=差异对比显示的最大行数（单个文件）
+config.git_max_diff_line_characters=差异对比显示的最大字符数（单行）
+config.git_max_diff_files=差异对比显示的最大文件数
+config.git_gc_args=GC 参数
+config.git_migrate_timeout=迁移操作超时
+config.git_mirror_timeout=镜像更新操作超时
+config.git_clone_timeout=克隆操作超时
+config.git_pull_timeout=拉取操作超时
+config.git_gc_timeout=GC 操作超时
+
 config.log_config=日志配置
 config.log_mode=日志模式

--- a/conf/locale/locale_zh-HK.ini
+++ b/conf/locale/locale_zh-HK.ini
@@ -96,6 +96,8 @@ offline_mode=啓用離線模式
 offline_mode_popup=在部署模式下也禁用從 CDN 獲取文件，所有的資源將從本地伺服器獲取。
 disable_gravatar=禁用 Gravatar 服務
 disable_gravatar_popup=禁用 Gravatar 和自定義源，僅使用由用戶上傳或默認的頭像。
+federated_avatar_lookup=Enable Federated Avatars Lookup
+federated_avatar_lookup_popup=Enable federated avatars lookup to use federated open source service based on libravatar.
 disable_registration=禁止用戶自主註冊
 disable_registration_popup=禁止用戶自主註冊功能，只有管理員可以添加帳號。
 enable_captcha=啟用驗證碼服務
@@ -239,6 +241,7 @@ form.name_pattern_not_allowed=用戶名不允許 '%s' 的格式。
 [settings]
 profile=個人信息
 password=修改密碼
+avatar=Avatar
 ssh_keys=管理 SSH 密鑰
 social=社交帳號綁定
 applications=管理授權應用
@@ -259,6 +262,8 @@ change_username_prompt=該操作將會影響到所有與您帳戶有關的鏈接
 continue=繼續操作
 cancel=取消操作

+lookup_avatar_by_mail=Lookup Avatar by mail
+federated_avatar_lookup=Federated Avatar Lookup
 enable_custom_avatar=啟動自定義頭像
 choose_new_avatar=選擇新的頭像
 update_avatar=更新頭像設置
@@ -345,7 +350,7 @@ fork_from=派生自
 fork_visiblity_helper=派生倉庫無法修改可見性。
 repo_desc=倉庫描述
 repo_lang=倉庫語言
-repo_lang_helper=請選擇 .gitignore 文件
+repo_gitignore_helper=Select .gitignore templates
 license=授權許可
 license_helper=請選擇授權許可文件
 readme=Readme
@@ -579,11 +584,13 @@ settings.site=官方網站
 settings.update_settings=更新倉庫設置
 settings.change_reponame_prompt=該操作將會影響到所有與該倉庫有關的鏈接
 settings.advanced_settings=高級設置
-settings.wiki_desc=啟用 Wiki 以允許用戶協作文檔
+settings.wiki_desc=Enable wiki system
+settings.use_internal_wiki=Use builtin wiki
 settings.use_external_wiki=使用外部 wiki
 settings.external_wiki_url=外部 Wiki 連結
 settings.external_wiki_url_desc=當分頁上按一下，訪客將會重新導到 URL。
-settings.issues_desc=啟用內置的輕量級問題管理系統
+settings.issues_desc=Enable issue tracker
+settings.use_internal_issue_tracker=Use builtin lightweight issue tracker
 settings.use_external_issue_tracker=使用外部的問題管理系統
 settings.tracker_url_format=外部問題管理系統的 URL 格式
 settings.tracker_issue_style=External Issue Tracker Naming Style:
@@ -1001,6 +1008,7 @@ config.db_ssl_mode=SSL 模式
 config.db_ssl_mode_helper=（僅限 "postgres" 使用）
 config.db_path=數據庫路徑
 config.db_path_helper=（用於 "sqlite3" 和 "tidb"）
+
 config.service_config=服務配置
 config.register_email_confirm=註冊電子郵件確認
 config.disable_register=關閉註冊功能
@@ -1011,10 +1019,12 @@ config.disable_key_size_check=禁用密鑰最小長度檢查
 config.enable_captcha=啟用驗證碼服務
 config.active_code_lives=激活用戶連結有效期
 config.reset_password_code_lives=重置密碼連結有效期
+
 config.webhook_config=Web 鉤子配置
 config.queue_length=隊列長度
 config.deliver_timeout=推送超時
 config.skip_tls_verify=忽略 TLS 驗證
+
 config.mailer_config=郵件配置
 config.mailer_enabled=啟用服務
 config.mailer_disable_helo=禁用 HELO 操作
@@ -1024,12 +1034,15 @@ config.mailer_user=發送者帳號
 config.send_test_mail=發送測試郵件
 config.test_mail_failed=無法向 '%s' 發送測試郵件: %v
 config.test_mail_sent=測試電子郵件已發送到 '%s'。
+
 config.oauth_config=社交帳號配置
 config.oauth_enabled=啟用服務
+
 config.cache_config=Cache 配置
 config.cache_adapter=Cache 適配器
 config.cache_interval=Cache 周期
 config.cache_conn=Cache 連接字符串
+
 config.session_config=Session 配置
 config.session_provider=Session 提供者
 config.provider_config=提供者配置
@@ -1039,9 +1052,24 @@ config.gc_interval_time=垃圾收集周期
 config.session_life_time=Session 生命周期
 config.https_only=僅限 HTTPS
 config.cookie_life_time=Cookie 生命周期
+
 config.picture_config=圖片配置
 config.picture_service=圖片服務
 config.disable_gravatar=禁用 Gravatar 頭像
+config.enable_federated_avatar=Enable Federated Avatars
+
+config.git_config=Git Configuration
+config.git_disable_diff_highlight=Disable Diff Syntax Highlight
+config.git_max_diff_lines=Max Diff Lines (for a single file)
+config.git_max_diff_line_characters=Max Diff Characters (for a single line)
+config.git_max_diff_files=Max Diff Files (to be shown)
+config.git_gc_args=GC Arguments
+config.git_migrate_timeout=Migration Timeout
+config.git_mirror_timeout=Mirror Update Timeout
+config.git_clone_timeout=Clone Operation Timeout
+config.git_pull_timeout=Pull Operation Timeout
+config.git_gc_timeout=GC Operation Timeout
+
 config.log_config=日誌配置
 config.log_mode=日誌模式

--- a/conf/locale/locale_zh-TW.ini
+++ b/conf/locale/locale_zh-TW.ini
@@ -96,6 +96,8 @@ offline_mode=啓用離線模式
 offline_mode_popup=在部署模式下也禁用從 CDN 獲取文件，所有的資源將從本地伺服器獲取。
 disable_gravatar=禁用 Gravatar 服務
 disable_gravatar_popup=禁用 Gravatar 和自定義源，僅使用由用戶上傳或默認的頭像。
+federated_avatar_lookup=Enable Federated Avatars Lookup
+federated_avatar_lookup_popup=Enable federated avatars lookup to use federated open source service based on libravatar.
 disable_registration=禁止用戶自主註冊
 disable_registration_popup=禁止用戶自主註冊功能，只有管理員可以添加帳號。
 enable_captcha=啟用驗證碼服務
@@ -239,6 +241,7 @@ form.name_pattern_not_allowed=用戶名不允許 '%s' 的格式。
 [settings]
 profile=個人信息
 password=修改密碼
+avatar=Avatar
 ssh_keys=管理 SSH 密鑰
 social=社交帳號綁定
 applications=管理授權應用
@@ -259,6 +262,8 @@ change_username_prompt=該操作將會影響到所有與您帳戶有關的鏈接
 continue=繼續操作
 cancel=取消操作

+lookup_avatar_by_mail=Lookup Avatar by mail
+federated_avatar_lookup=Federated Avatar Lookup
 enable_custom_avatar=啟動自定義頭像
 choose_new_avatar=選擇新的頭像
 update_avatar=更新頭像設置
@@ -345,7 +350,7 @@ fork_from=派生自
 fork_visiblity_helper=派生倉庫無法修改可見性。
 repo_desc=倉庫描述
 repo_lang=倉庫語言
-repo_lang_helper=請選擇 .gitignore 文件
+repo_gitignore_helper=Select .gitignore templates
 license=授權許可
 license_helper=請選擇授權許可文件
 readme=Readme
@@ -579,11 +584,13 @@ settings.site=官方網站
 settings.update_settings=更新倉庫設置
 settings.change_reponame_prompt=該操作將會影響到所有與該倉庫有關的鏈接
 settings.advanced_settings=高級設置
-settings.wiki_desc=啟用 Wiki 以允許用戶協作文檔
+settings.wiki_desc=Enable wiki system
+settings.use_internal_wiki=Use builtin wiki
 settings.use_external_wiki=使用外部 wiki
 settings.external_wiki_url=外部 Wiki 連結
 settings.external_wiki_url_desc=當分頁上按一下，訪客將會重新導到 URL。
-settings.issues_desc=啟用內置的輕量級問題管理系統
+settings.issues_desc=Enable issue tracker
+settings.use_internal_issue_tracker=Use builtin lightweight issue tracker
 settings.use_external_issue_tracker=使用外部的問題管理系統
 settings.tracker_url_format=外部問題管理系統的 URL 格式
 settings.tracker_issue_style=外部公單管理系統命名風格：
@@ -1001,6 +1008,7 @@ config.db_ssl_mode=SSL 模式
 config.db_ssl_mode_helper=（僅限 "postgres" 使用）
 config.db_path=數據庫路徑
 config.db_path_helper=（用於 "sqlite3" 和 "tidb"）
+
 config.service_config=服務配置
 config.register_email_confirm=註冊電子郵件確認
 config.disable_register=關閉註冊功能
@@ -1011,10 +1019,12 @@ config.disable_key_size_check=禁用密鑰最小長度檢查
 config.enable_captcha=啟用驗證碼服務
 config.active_code_lives=激活用戶連結有效期
 config.reset_password_code_lives=重置密碼連結有效期
+
 config.webhook_config=Web 鉤子配置
 config.queue_length=隊列長度
 config.deliver_timeout=推送超時
 config.skip_tls_verify=忽略 TLS 驗證
+
 config.mailer_config=郵件配置
 config.mailer_enabled=啟用服務
 config.mailer_disable_helo=禁用 HELO 操作
@@ -1024,12 +1034,15 @@ config.mailer_user=發送者帳號
 config.send_test_mail=發送測試郵件
 config.test_mail_failed=無法向 '%s' 發送測試郵件: %v
 config.test_mail_sent=測試電子郵件已發送到 '%s'。
+
 config.oauth_config=社交帳號配置
 config.oauth_enabled=啟用服務
+
 config.cache_config=Cache 配置
 config.cache_adapter=Cache 適配器
 config.cache_interval=Cache 周期
 config.cache_conn=Cache 連接字符串
+
 config.session_config=Session 配置
 config.session_provider=Session 提供者
 config.provider_config=提供者配置
@@ -1039,9 +1052,24 @@ config.gc_interval_time=垃圾收集周期
 config.session_life_time=Session 生命周期
 config.https_only=僅限 HTTPS
 config.cookie_life_time=Cookie 生命周期
+
 config.picture_config=圖片配置
 config.picture_service=圖片服務
 config.disable_gravatar=禁用 Gravatar 頭像
+config.enable_federated_avatar=Enable Federated Avatars
+
+config.git_config=Git Configuration
+config.git_disable_diff_highlight=Disable Diff Syntax Highlight
+config.git_max_diff_lines=Max Diff Lines (for a single file)
+config.git_max_diff_line_characters=Max Diff Characters (for a single line)
+config.git_max_diff_files=Max Diff Files (to be shown)
+config.git_gc_args=GC Arguments
+config.git_migrate_timeout=Migration Timeout
+config.git_mirror_timeout=Mirror Update Timeout
+config.git_clone_timeout=Clone Operation Timeout
+config.git_pull_timeout=Pull Operation Timeout
+config.git_gc_timeout=GC Operation Timeout
+
 config.log_config=日誌配置
 config.log_mode=日誌模式

--- a/docker/README.md
+++ b/docker/README.md
@@ -71,7 +71,7 @@ Most of settings are obvious and easy to understand, but there are some settings
 - **HTTP Port**: Use port you want Gogs to listen on inside Docker container. For example, your Gogs listens on `3000` inside Docker, and you expose it by `10080:3000`, but you still use `3000` for this value.
 - **Application URL**: Use combination of **Domain** and **exposed HTTP Port** values (e.g. `http://192.168.99.100:10080/`).

-Full documentation of application settings can be found [here](http://gogs.io/docs/advanced/configuration_cheat_sheet.html).
+Full documentation of application settings can be found [here](https://gogs.io/docs/advanced/configuration_cheat_sheet.html).

 ### Container options

--- a/glide.lock
+++ b/glide.lock
@@ -33,17 +33,17 @@ imports:
 - name: github.com/go-sql-driver/mysql
  version: 0b58b37b664c21f3010e836f1b931e1d0b0b0685
 - name: github.com/go-xorm/core
-  version: bc1b7f81f0e369289078424064634a5ee7d21051
+  version: 5bf745d7d163f4380e6c2bba8c4afa60534dd087
 - name: github.com/go-xorm/xorm
-  version: b8b1711cde4d9c68da95cd0ff8de0de0cb491df3
+  version: c6c705684057842d9854e8299dd51abb06ae29f5
 - name: github.com/gogits/chardet
  version: 2404f777256163ea3eadb273dada5dcb037993c0
 - name: github.com/gogits/cron
-  version: 96040e4fab17baa0391ce571694e4ccb5fce5dac
+  version: 7f3990acf1833faa5ebd0e86f0a4c72a4b5eba3c
 - name: github.com/gogits/git-module
-  version: 53bcb7352ff838610c537c9b589ca79bca92c661
+  version: 18dd87dc5eac9ee7076133c8363803f2192d5713
 - name: github.com/gogits/go-gogs-client
-  version: d725743594dfcd8eea25024f8456c9c103dadb1a
+  version: d1020b4da5474f7533f5b11084dcfd5536cf2e71
 - name: github.com/issue9/identicon
  version: d36b54562f4cf70c83653e13dc95c220c79ef521
 - name: github.com/jaytaylor/html2text
@@ -60,7 +60,7 @@ imports:
 - name: github.com/klauspost/crc32
  version: 19b0b332c9e4516a6370a0456e6182c3b5036720
 - name: github.com/lib/pq
-  version: 4dd446efc17690bc53e154025146f73203b18309
+  version: 80f8150043c80fb52dee6bc863a709cdac7ec8f8
  subpackages:
  - oid
 - name: github.com/mattn/go-sqlite3
@@ -81,6 +81,8 @@ imports:
  version: ec7fdbb58eb3e300c8595ad5ac74a5aa50019cc7
  subpackages:
  - diffmatchpatch
+- name: github.com/strk/go-libravatar
+  version: 5eed7bff870ae19ef51c5773dbc8f3e9fcbd0982
 - name: github.com/shurcooL/sanitized_anchor_name
  version: 10ef21a441db47d8b13ebcc5fd2310f636973c77
 - name: github.com/Unknwon/cae
@@ -140,9 +142,9 @@ imports:
 - name: gopkg.in/ini.v1
  version: cf53f9204df4fbdd7ec4164b57fa6184ba168292
 - name: gopkg.in/ldap.v2
-  version: 537128fee7cca108d8ce74e4309fdfcdd9c7f496
+  version: d0a5ced67b4dc310b9158d63a2c6f9c5ec13f105
 - name: gopkg.in/macaron.v1
-  version: 2133042f8d1022b8253e4e23f7940467941409ce
+  version: 7564489a79f3f96b7ac8034652b35eeebb468eb4
 - name: gopkg.in/redis.v2
  version: e6179049628164864e6e84e973cfb56335748dea
 devImports: []
--- a/glide.yaml
+++ b/glide.yaml
@@ -40,6 +40,7 @@ import:
 - package: github.com/sergi/go-diff
  subpackages:
  - diffmatchpatch
+- package: github.com/strk/go-libravatar
 - package: golang.org/x/crypto
  subpackages:
  - ssh
--- a/gogs.go
+++ b/gogs.go
@@ -17,7 +17,7 @@ import (
 	"github.com/gogits/gogs/modules/setting"
 )

-const APP_VER = "0.9.60.0803"
+const APP_VER = "0.9.71.0809"

 func init() {
 	runtime.GOMAXPROCS(runtime.NumCPU())
--- a/models/action.go
+++ b/models/action.go
@@ -234,10 +234,13 @@ func issueIndexTrimRight(c rune) bool {
 }

 type PushCommit struct {
-	Sha1        string
-	Message     string
-	AuthorEmail string
-	AuthorName  string
+	Sha1           string
+	Message        string
+	AuthorEmail    string
+	AuthorName     string
+	CommitterEmail string
+	CommitterName  string
+	Timestamp      time.Time
 }

 type PushCommits struct {
@@ -256,21 +259,33 @@ func NewPushCommits() *PushCommits {

 func (pc *PushCommits) ToApiPayloadCommits(repoLink string) []*api.PayloadCommit {
 	commits := make([]*api.PayloadCommit, len(pc.Commits))
-	for i, cmt := range pc.Commits {
-		author_username := ""
-		author, err := GetUserByEmail(cmt.AuthorEmail)
+	for i, commit := range pc.Commits {
+		authorUsername := ""
+		author, err := GetUserByEmail(commit.AuthorEmail)
 		if err == nil {
-			author_username = author.Name
+			authorUsername = author.Name
+		}
+		committerUsername := ""
+		committer, err := GetUserByEmail(commit.CommitterEmail)
+		if err == nil {
+			// TODO: check errors other than email not found.
+			committerUsername = committer.Name
 		}
 		commits[i] = &api.PayloadCommit{
-			ID:      cmt.Sha1,
-			Message: cmt.Message,
-			URL:     fmt.Sprintf("%s/commit/%s", repoLink, cmt.Sha1),
+			ID:      commit.Sha1,
+			Message: commit.Message,
+			URL:     fmt.Sprintf("%s/commit/%s", repoLink, commit.Sha1),
 			Author: &api.PayloadAuthor{
-				Name:     cmt.AuthorName,
-				Email:    cmt.AuthorEmail,
-				UserName: author_username,
+				Name:     commit.AuthorName,
+				Email:    commit.AuthorEmail,
+				UserName: authorUsername,
 			},
+			Committer: &api.PayloadCommitter{
+				Name:     commit.CommitterName,
+				Email:    commit.CommitterEmail,
+				UserName: committerUsername,
+			},
+			Timestamp: commit.Timestamp,
 		}
 	}
 	return commits
@@ -288,7 +303,7 @@ func (push *PushCommits) AvatarLink(email string) string {
 				log.Error(4, "GetUserByEmail: %v", err)
 			}
 		} else {
-			push.avatars[email] = u.AvatarLink()
+			push.avatars[email] = u.RelAvatarLink()
 		}
 	}

--- a/models/git_diff.go
+++ b/models/git_diff.go
@@ -26,6 +26,7 @@ import (
 	"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"
 )

@@ -70,17 +71,18 @@ var (
 )

 func diffToHTML(diffs []diffmatchpatch.Diff, lineType DiffLineType) template.HTML {
-	var buf bytes.Buffer
+	buf := bytes.NewBuffer(nil)
 	for i := range diffs {
-		if diffs[i].Type == diffmatchpatch.DiffInsert && lineType == DIFF_LINE_ADD {
+		switch {
+		case diffs[i].Type == diffmatchpatch.DiffInsert && lineType == DIFF_LINE_ADD:
 			buf.Write(addedCodePrefix)
 			buf.WriteString(html.EscapeString(diffs[i].Text))
 			buf.Write(codeTagSuffix)
-		} else if diffs[i].Type == diffmatchpatch.DiffDelete && lineType == DIFF_LINE_DEL {
+		case diffs[i].Type == diffmatchpatch.DiffDelete && lineType == DIFF_LINE_DEL:
 			buf.Write(removedCodePrefix)
 			buf.WriteString(html.EscapeString(diffs[i].Text))
 			buf.Write(codeTagSuffix)
-		} else if diffs[i].Type == diffmatchpatch.DiffEqual {
+		case diffs[i].Type == diffmatchpatch.DiffEqual:
 			buf.WriteString(html.EscapeString(diffs[i].Text))
 		}
 	}
@@ -90,62 +92,86 @@ func diffToHTML(diffs []diffmatchpatch.Diff, lineType DiffLineType) template.HTM

 // get an specific line by type (add or del) and file line number
 func (diffSection *DiffSection) GetLine(lineType DiffLineType, idx int) *DiffLine {
-	difference := 0
+	var (
+		difference    = 0
+		addCount      = 0
+		delCount      = 0
+		matchDiffLine *DiffLine
+	)

+LOOP:
 	for _, diffLine := range diffSection.Lines {
-		if diffLine.Type == DIFF_LINE_PLAIN {
-			// get the difference of line numbers between ADD and DEL versions
+		switch diffLine.Type {
+		case DIFF_LINE_ADD:
+			addCount++
+		case DIFF_LINE_DEL:
+			delCount++
+		default:
+			if matchDiffLine != nil {
+				break LOOP
+			}
 			difference = diffLine.RightIdx - diffLine.LeftIdx
-			continue
+			addCount = 0
+			delCount = 0
 		}

-		if lineType == DIFF_LINE_DEL {
+		switch lineType {
+		case DIFF_LINE_DEL:
 			if diffLine.RightIdx == 0 && diffLine.LeftIdx == idx-difference {
-				return diffLine
+				matchDiffLine = diffLine
 			}
-		} else if lineType == DIFF_LINE_ADD {
+		case DIFF_LINE_ADD:
 			if diffLine.LeftIdx == 0 && diffLine.RightIdx == idx+difference {
-				return diffLine
+				matchDiffLine = diffLine
 			}
 		}
 	}
+
+	if addCount == delCount {
+		return matchDiffLine
+	}
 	return nil
 }

+var diffMatchPatch = diffmatchpatch.New()
+
+func init() {
+	diffMatchPatch.DiffEditCost = 100
+}
+
 // computes inline diff for the given line
 func (diffSection *DiffSection) GetComputedInlineDiffFor(diffLine *DiffLine) template.HTML {
-	var compareDiffLine *DiffLine
-	var diff1, diff2 string
-
-	getDefaultReturn := func() template.HTML {
+	if setting.Git.DisableDiffHighlight {
 		return template.HTML(html.EscapeString(diffLine.Content[1:]))
 	}
-
-	// just compute diff for adds and removes
-	if diffLine.Type != DIFF_LINE_ADD && diffLine.Type != DIFF_LINE_DEL {
-		return getDefaultReturn()
-	}
+	var (
+		compareDiffLine *DiffLine
+		diff1           string
+		diff2           string
+	)

 	// try to find equivalent diff line. ignore, otherwise
-	if diffLine.Type == DIFF_LINE_ADD {
+	switch diffLine.Type {
+	case DIFF_LINE_ADD:
 		compareDiffLine = diffSection.GetLine(DIFF_LINE_DEL, diffLine.RightIdx)
 		if compareDiffLine == nil {
-			return getDefaultReturn()
+			return template.HTML(html.EscapeString(diffLine.Content[1:]))
 		}
 		diff1 = compareDiffLine.Content
 		diff2 = diffLine.Content
-	} else {
+	case DIFF_LINE_DEL:
 		compareDiffLine = diffSection.GetLine(DIFF_LINE_ADD, diffLine.LeftIdx)
 		if compareDiffLine == nil {
-			return getDefaultReturn()
+			return template.HTML(html.EscapeString(diffLine.Content[1:]))
 		}
 		diff1 = diffLine.Content
 		diff2 = compareDiffLine.Content
+	default:
+		return template.HTML(html.EscapeString(diffLine.Content[1:]))
 	}

-	dmp := diffmatchpatch.New()
-	diffRecord := dmp.DiffMain(diff1[1:], diff2[1:], true)
-	diffRecord = dmp.DiffCleanupSemantic(diffRecord)
+	diffRecord := diffMatchPatch.DiffMain(diff1[1:], diff2[1:], true)
+	diffRecord = diffMatchPatch.DiffCleanupEfficiency(diffRecord)

 	return diffToHTML(diffRecord, diffLine.Type)
 }
--- a/models/git_diff_test.go
+++ b/models/git_diff_test.go
@@ -33,38 +33,3 @@ func TestDiffToHTML(t *testing.T) {
 		dmp.Diff{dmp.DiffEqual, " biz"},
 	}, DIFF_LINE_DEL))
 }
-
-// test if GetLine is return the correct lines
-func TestGetLine(t *testing.T) {
-	ds := DiffSection{Lines: []*DiffLine{
-		&DiffLine{LeftIdx: 28, RightIdx: 28, Type: DIFF_LINE_PLAIN},
-		&DiffLine{LeftIdx: 29, RightIdx: 29, Type: DIFF_LINE_PLAIN},
-		&DiffLine{LeftIdx: 30, RightIdx: 30, Type: DIFF_LINE_PLAIN},
-		&DiffLine{LeftIdx: 31, RightIdx: 0, Type: DIFF_LINE_DEL},
-		&DiffLine{LeftIdx: 0, RightIdx: 31, Type: DIFF_LINE_ADD},
-		&DiffLine{LeftIdx: 0, RightIdx: 32, Type: DIFF_LINE_ADD},
-		&DiffLine{LeftIdx: 32, RightIdx: 33, Type: DIFF_LINE_PLAIN},
-		&DiffLine{LeftIdx: 33, RightIdx: 0, Type: DIFF_LINE_DEL},
-		&DiffLine{LeftIdx: 34, RightIdx: 0, Type: DIFF_LINE_DEL},
-		&DiffLine{LeftIdx: 35, RightIdx: 0, Type: DIFF_LINE_DEL},
-		&DiffLine{LeftIdx: 36, RightIdx: 0, Type: DIFF_LINE_DEL},
-		&DiffLine{LeftIdx: 0, RightIdx: 34, Type: DIFF_LINE_ADD},
-		&DiffLine{LeftIdx: 0, RightIdx: 35, Type: DIFF_LINE_ADD},
-		&DiffLine{LeftIdx: 0, RightIdx: 36, Type: DIFF_LINE_ADD},
-		&DiffLine{LeftIdx: 0, RightIdx: 37, Type: DIFF_LINE_ADD},
-		&DiffLine{LeftIdx: 37, RightIdx: 38, Type: DIFF_LINE_PLAIN},
-		&DiffLine{LeftIdx: 38, RightIdx: 39, Type: DIFF_LINE_PLAIN},
-	}}
-
-	assertLineEqual(t, ds.GetLine(DIFF_LINE_ADD, 31), ds.Lines[4])
-	assertLineEqual(t, ds.GetLine(DIFF_LINE_DEL, 31), ds.Lines[3])
-
-	assertLineEqual(t, ds.GetLine(DIFF_LINE_ADD, 33), ds.Lines[11])
-	assertLineEqual(t, ds.GetLine(DIFF_LINE_ADD, 34), ds.Lines[12])
-	assertLineEqual(t, ds.GetLine(DIFF_LINE_ADD, 35), ds.Lines[13])
-	assertLineEqual(t, ds.GetLine(DIFF_LINE_ADD, 36), ds.Lines[14])
-	assertLineEqual(t, ds.GetLine(DIFF_LINE_DEL, 34), ds.Lines[7])
-	assertLineEqual(t, ds.GetLine(DIFF_LINE_DEL, 35), ds.Lines[8])
-	assertLineEqual(t, ds.GetLine(DIFF_LINE_DEL, 36), ds.Lines[9])
-	assertLineEqual(t, ds.GetLine(DIFF_LINE_DEL, 37), ds.Lines[10])
-}
--- a/models/issue.go
+++ b/models/issue.go
@@ -160,7 +160,13 @@ func (i *Issue) State() string {
 }

 func (issue *Issue) FullLink() string {
-	return fmt.Sprintf("%s/issues/%d", issue.Repo.FullLink(), issue.Index)
+	var path string
+	if issue.IsPull {
+		path = "pulls"
+	} else {
+		path = "issues"
+	}
+	return fmt.Sprintf("%s/%s/%d", issue.Repo.FullLink(), path, issue.Index)
 }

 // IsPoster returns true if given user by ID is the poster.
@@ -905,7 +911,7 @@ func GetUserIssueStats(repoID, uid int64, repoIDs []int64, filterMode int, isPul
 		Count(&Issue{})

 	stats.CreateCount, _ = countSession(false, isPull, repoID, repoIDs).
-		And("assignee_id = ?", uid).
+		And("poster_id = ?", uid).
 		Count(&Issue{})

 	openCountSession := countSession(false, isPull, repoID, repoIDs)
--- a/models/org.go
+++ b/models/org.go
@@ -414,8 +414,11 @@ func RemoveOrgUser(orgID, userID int64) error {
 			return err
 		}
 	}
-	if _, err = sess.Where("user_id = ?", user.ID).In("repo_id", repoIDs).Delete(new(Access)); err != nil {
-		return err
+
+	if len(repoIDs) > 0 {
+		if _, err = sess.Where("user_id = ?", user.ID).In("repo_id", repoIDs).Delete(new(Access)); err != nil {
+			return err
+		}
 	}

 	// Delete member in his/her teams.
--- a/models/pull.go
+++ b/models/pull.go
@@ -246,13 +246,14 @@ func (pr *PullRequest) Merge(doer *User, baseGitRepo *git.Repository) (err error
 		Sender: &api.PayloadUser{
 			UserName:  doer.Name,
 			ID:        doer.ID,
-			AvatarUrl: setting.AppUrl + doer.RelAvatarLink(),
+			AvatarUrl: doer.AvatarLink(),
 		},
 	}
 	if err = PrepareWebhooks(pr.BaseRepo, HOOK_EVENT_PUSH, p); err != nil {
 		return fmt.Errorf("PrepareWebhooks: %v", err)
 	}
 	go HookQueue.Add(pr.BaseRepo.ID)
+	go AddTestPullRequestTask(pr.BaseRepo.ID, pr.BaseBranch)
 	return nil
 }

--- a/models/release.go
+++ b/models/release.go
@@ -39,7 +39,9 @@ type Release struct {
 }

 func (r *Release) BeforeInsert() {
-	r.CreatedUnix = time.Now().Unix()
+	if r.CreatedUnix == 0 {
+		r.CreatedUnix = time.Now().Unix()
+	}
 }

 func (r *Release) AfterSet(colName string, _ xorm.Cell) {
--- a/models/repo.go
+++ b/models/repo.go
@@ -494,6 +494,11 @@ type CloneLink struct {
 	Git   string
 }

+// ComposeHTTPSCloneURL returns HTTPS clone URL based on given owner and repository name.
+func ComposeHTTPSCloneURL(owner, repo string) string {
+	return fmt.Sprintf("%s%s/%s.git", setting.AppUrl, owner, repo)
+}
+
 func (repo *Repository) cloneLink(isWiki bool) *CloneLink {
 	repoName := repo.Name
 	if isWiki {
@@ -507,7 +512,7 @@ func (repo *Repository) cloneLink(isWiki bool) *CloneLink {
 	} else {
 		cl.SSH = fmt.Sprintf("%s@%s:%s/%s.git", setting.RunUser, setting.SSH.Domain, repo.Owner.Name, repoName)
 	}
-	cl.HTTPS = fmt.Sprintf("%s%s/%s.git", setting.AppUrl, repo.Owner.Name, repoName)
+	cl.HTTPS = ComposeHTTPSCloneURL(repo.Owner.Name, repo.Name)
 	return cl
 }

@@ -719,9 +724,9 @@ func MigrateRepository(u *User, opts MigrateRepoOptions) (*Repository, error) {
 	if opts.IsMirror {
 		if _, err = x.InsertOne(&Mirror{
 			RepoID:      repo.ID,
-			Interval:    24,
+			Interval:    setting.Mirror.DefaultInterval,
 			EnablePrune: true,
-			NextUpdate:  time.Now().Add(24 * time.Hour),
+			NextUpdate:  time.Now().Add(time.Duration(setting.Mirror.DefaultInterval) * time.Hour),
 		}); err != nil {
 			return repo, fmt.Errorf("InsertOne: %v", err)
 		}
@@ -1736,14 +1741,17 @@ func GitFsck() {
 }

 func GitGcRepos() error {
-	args := append([]string{"gc"}, setting.Git.GcArgs...)
+	args := append([]string{"gc"}, setting.Git.GCArgs...)
 	return x.Where("id > 0").Iterate(new(Repository),
 		func(idx int, bean interface{}) error {
 			repo := bean.(*Repository)
 			if err := repo.GetOwner(); err != nil {
 				return err
 			}
-			_, stderr, err := process.ExecDir(-1, RepoPath(repo.Owner.Name, repo.Name), "Repository garbage collection", "git", args...)
+			_, stderr, err := process.ExecDir(
+				time.Duration(setting.Git.Timeout.GC)*time.Second,
+				RepoPath(repo.Owner.Name, repo.Name), "Repository garbage collection",
+				"git", args...)
 			if err != nil {
 				return fmt.Errorf("%v: %v", err, stderr)
 			}
--- a/models/update.go
+++ b/models/update.go
@@ -56,10 +56,14 @@ func ListToPushCommits(l *list.List) *PushCommits {
 			actEmail = commit.Committer.Email
 		}
 		commits = append(commits,
-			&PushCommit{commit.ID.String(),
-				commit.Message(),
-				commit.Author.Email,
-				commit.Author.Name,
+			&PushCommit{
+				Sha1:           commit.ID.String(),
+				Message:        commit.Message(),
+				AuthorEmail:    commit.Author.Email,
+				AuthorName:     commit.Author.Name,
+				CommitterEmail: commit.Committer.Email,
+				CommitterName:  commit.Committer.Name,
+				Timestamp:      commit.Author.When,
 			})
 	}
 	return &PushCommits{l.Len(), commits, "", nil}
--- a/models/user.go
+++ b/models/user.go
@@ -230,8 +230,11 @@ func (u *User) GenerateRandomAvatar() error {
 	return nil
 }

+// RelAvatarLink returns relative avatar link to the site domain,
+// which includes app sub-url as prefix. However, it is possible
+// to return full URL if user enables Gravatar-like service.
 func (u *User) RelAvatarLink() string {
-	defaultImgUrl := "/img/avatar_default.png"
+	defaultImgUrl := setting.AppSubUrl + "/img/avatar_default.png"
 	if u.ID == -1 {
 		return defaultImgUrl
 	}
@@ -241,7 +244,7 @@ func (u *User) RelAvatarLink() string {
 		if !com.IsExist(u.CustomAvatarPath()) {
 			return defaultImgUrl
 		}
-		return "/avatars/" + com.ToStr(u.ID)
+		return setting.AppSubUrl + "/avatars/" + com.ToStr(u.ID)
 	case setting.DisableGravatar, setting.OfflineMode:
 		if !com.IsExist(u.CustomAvatarPath()) {
 			if err := u.GenerateRandomAvatar(); err != nil {
@@ -249,16 +252,16 @@ func (u *User) RelAvatarLink() string {
 			}
 		}

-		return "/avatars/" + com.ToStr(u.ID)
+		return setting.AppSubUrl + "/avatars/" + com.ToStr(u.ID)
 	}
-	return setting.GravatarSource + u.Avatar
+	return base.AvatarLink(u.AvatarEmail)
 }

-// AvatarLink returns user avatar link.
+// AvatarLink returns user avatar absolute link.
 func (u *User) AvatarLink() string {
 	link := u.RelAvatarLink()
 	if link[0] == '/' && link[1] != '/' {
-		return strings.TrimSuffix(setting.AppUrl, "/") + link
+		return setting.AppUrl + link[1:]
 	}
 	return link
 }
--- a/modules/auth/user_form.go
+++ b/modules/auth/user_form.go
@@ -36,11 +36,12 @@ type InstallForm struct {
 	RegisterConfirm bool
 	MailNotify      bool

-	OfflineMode         bool
-	DisableGravatar     bool
-	DisableRegistration bool
-	EnableCaptcha       bool
-	RequireSignInView   bool
+	OfflineMode           bool
+	DisableGravatar       bool
+	EnableFederatedAvatar bool
+	DisableRegistration   bool
+	EnableCaptcha         bool
+	RequireSignInView     bool

 	AdminName          string `binding:"OmitEmpty;AlphaDashDot;MaxSize(30)" locale:"install.admin_name"`
 	AdminPasswd        string `binding:"OmitEmpty;MaxSize(255)" locale:"install.admin_password"`
@@ -93,19 +94,25 @@ type UpdateProfileForm struct {
 	Email    string `binding:"Required;Email;MaxSize(254)"`
 	Website  string `binding:"Url;MaxSize(100)"`
 	Location string `binding:"MaxSize(50)"`
-	Gravatar string `binding:"OmitEmpty;Email;MaxSize(254)"`
 }

 func (f *UpdateProfileForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors {
 	return validate(errs, ctx.Data, f, ctx.Locale)
 }

-type UploadAvatarForm struct {
-	Enable bool
-	Avatar *multipart.FileHeader
+const (
+	AVATAR_LOCAL  string = "local"
+	AVATAR_BYMAIL string = "bymail"
+)
+
+type AvatarForm struct {
+	Source      string
+	Avatar      *multipart.FileHeader
+	Gravatar    string `binding:"OmitEmpty;Email;MaxSize(254)"`
+	Federavatar bool
 }

-func (f *UploadAvatarForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors {
+func (f *AvatarForm) Validate(ctx *macaron.Context, errs binding.Errors) binding.Errors {
 	return validate(errs, ctx.Data, f, ctx.Locale)
 }

--- a/modules/base/tool.go
+++ b/modules/base/tool.go
@@ -204,13 +204,24 @@ func HashEmail(email string) string {
 	return hex.EncodeToString(h.Sum(nil))
 }

-// AvatarLink returns avatar link by given email.
-func AvatarLink(email string) string {
-	if setting.DisableGravatar || setting.OfflineMode {
-		return setting.AppSubUrl + "/img/avatar_default.png"
+// AvatarLink returns relative avatar link to the site domain by given email,
+// which includes app sub-url as prefix. However, it is possible
+// to return full URL if user enables Gravatar-like service.
+func AvatarLink(email string) (url string) {
+	if setting.EnableFederatedAvatar && setting.LibravatarService != nil {
+		var err error
+		url, err = setting.LibravatarService.FromEmail(email)
+		if err != nil {
+			log.Error(1, "LibravatarService.FromEmail: %v", err)
+		}
 	}
-
-	return setting.GravatarSource + HashEmail(email)
+	if len(url) == 0 && !setting.DisableGravatar {
+		url = setting.GravatarSource + HashEmail(email)
+	}
+	if len(url) == 0 {
+		url = setting.AppSubUrl + "/img/avatar_default.png"
+	}
+	return url
 }

 // Seconds-based time units
--- a/modules/bindata/bindata.go
+++ b/modules/bindata/bindata.go
--- a/modules/context/repo.go
+++ b/modules/context/repo.go
@@ -9,6 +9,7 @@ import (
 	"path"
 	"strings"

+	"github.com/Unknwon/com"
 	"gopkg.in/macaron.v1"

 	"github.com/gogits/git-module"
@@ -84,6 +85,24 @@ func RetrieveBaseRepo(ctx *Context, repo *models.Repository) {
 	}
 }

+// composeGoGetImport returns go-get-import meta content.
+func composeGoGetImport(owner, repo string) string {
+	return path.Join(setting.Domain, setting.AppSubUrl, owner, repo)
+}
+
+// earlyResponseForGoGetMeta responses appropriate go-get meta with status 200
+// if user does not have actual access to the requested repository,
+// or the owner or repository does not exist at all.
+// This is particular a workaround for "go get" command which does not respect
+// .netrc file.
+func earlyResponseForGoGetMeta(ctx *Context) {
+	ctx.PlainText(200, []byte(com.Expand(`<meta name="go-import" content="{GoGetImport} git {CloneLink}">`,
+		map[string]string{
+			"GoGetImport": composeGoGetImport(ctx.Params(":username"), ctx.Params(":reponame")),
+			"CloneLink":   models.ComposeHTTPSCloneURL(ctx.Params(":username"), ctx.Params(":reponame")),
+		})))
+}
+
 func RepoAssignment(args ...bool) macaron.Handler {
 	return func(ctx *Context) {
 		var (
@@ -112,6 +131,10 @@ func RepoAssignment(args ...bool) macaron.Handler {
 			owner, err = models.GetUserByName(userName)
 			if err != nil {
 				if models.IsErrUserNotExist(err) {
+					if ctx.Query("go-get") == "1" {
+						earlyResponseForGoGetMeta(ctx)
+						return
+					}
 					ctx.Handle(404, "GetUserByName", err)
 				} else {
 					ctx.Handle(500, "GetUserByName", err)
@@ -125,6 +148,10 @@ func RepoAssignment(args ...bool) macaron.Handler {
 		repo, err := models.GetRepositoryByName(owner.ID, repoName)
 		if err != nil {
 			if models.IsErrRepoNotExist(err) {
+				if ctx.Query("go-get") == "1" {
+					earlyResponseForGoGetMeta(ctx)
+					return
+				}
 				ctx.Handle(404, "GetRepositoryByName", err)
 			} else {
 				ctx.Handle(500, "GetRepositoryByName", err)
@@ -149,6 +176,10 @@ func RepoAssignment(args ...bool) macaron.Handler {

 		// Check access.
 		if ctx.Repo.AccessMode == models.ACCESS_MODE_NONE {
+			if ctx.Query("go-get") == "1" {
+				earlyResponseForGoGetMeta(ctx)
+				return
+			}
 			ctx.Handle(404, "no access right", err)
 			return
 		}
@@ -244,8 +275,8 @@ func RepoAssignment(args ...bool) macaron.Handler {
 			}
 		}

-		// People who have push access and propose a new pull request.
-		if ctx.Repo.IsWriter() {
+		// People who have push access or have fored repository can propose a new pull request.
+		if ctx.Repo.IsWriter() || (ctx.IsSigned && ctx.User.HasForkedRepo(ctx.Repo.Repository.ID)) {
 			// Pull request is allowed if this is a fork repository
 			// and base repository accepts pull requests.
 			if repo.BaseRepo != nil {
@@ -269,7 +300,7 @@ func RepoAssignment(args ...bool) macaron.Handler {
 		ctx.Data["PullRequestCtx"] = ctx.Repo.PullRequest

 		if ctx.Query("go-get") == "1" {
-			ctx.Data["GoGetImport"] = path.Join(setting.Domain, setting.AppSubUrl, owner.Name, repo.Name)
+			ctx.Data["GoGetImport"] = composeGoGetImport(owner.Name, repo.Name)
 			prefix := setting.AppUrl + path.Join(owner.Name, repo.Name, "src", ctx.Repo.BranchName)
 			ctx.Data["GoDocDirectory"] = prefix + "{/dir}"
 			ctx.Data["GoDocFile"] = prefix + "{/dir}/{file}#L{line}"
--- a/modules/markdown/markdown.go
+++ b/modules/markdown/markdown.go
@@ -260,12 +260,9 @@ func RenderIssueIndexPattern(rawBytes []byte, urlPrefix string, metas map[string

 // RenderSha1CurrentPattern renders SHA1 strings to corresponding links that assumes in the same repository.
 func RenderSha1CurrentPattern(rawBytes []byte, urlPrefix string) []byte {
-	ms := Sha1CurrentPattern.FindAll(rawBytes, -1)
-	for _, m := range ms {
-		rawBytes = bytes.Replace(rawBytes, m, []byte(fmt.Sprintf(
-			`<a href="%s/commit/%s"><code>%s</code></a>`, urlPrefix, m, base.ShortSha(string(m)))), -1)
-	}
-	return rawBytes
+	return []byte(Sha1CurrentPattern.ReplaceAllStringFunc(string(rawBytes[:]), func(m string) string {
+		return fmt.Sprintf(`<a href="%s/commit/%s"><code>%s</code></a>`, urlPrefix, m, base.ShortSha(string(m)))
+	}))
 }

 // RenderSpecialLink renders mentions, indexes and SHA1 strings to corresponding links.
--- a/modules/setting/setting.go
+++ b/modules/setting/setting.go
@@ -20,6 +20,7 @@ import (
 	_ "github.com/go-macaron/cache/redis"
 	"github.com/go-macaron/session"
 	_ "github.com/go-macaron/session/redis"
+	"github.com/strk/go-libravatar"
 	"gopkg.in/ini.v1"

 	"github.com/gogits/gogs/modules/bindata"
@@ -140,9 +141,11 @@ var (
 	}

 	// Picture settings
-	AvatarUploadPath string
-	GravatarSource   string
-	DisableGravatar  bool
+	AvatarUploadPath      string
+	GravatarSource        string
+	DisableGravatar       bool
+	EnableFederatedAvatar bool
+	LibravatarService     *libravatar.Libravatar

 	// Log settings
 	LogRootPath string
@@ -191,18 +194,25 @@ var (

 	// Git settings
 	Git struct {
+		DisableDiffHighlight     bool
 		MaxGitDiffLines          int
 		MaxGitDiffLineCharacters int
 		MaxGitDiffFiles          int
-		GcArgs                   []string `delim:" "`
+		GCArgs                   []string `delim:" "`
 		Timeout                  struct {
 			Migrate int
 			Mirror  int
 			Clone   int
 			Pull    int
+			GC      int `ini:"GC"`
 		} `ini:"git.timeout"`
 	}

+	// Mirror settings
+	Mirror struct {
+		DefaultInterval int
+	}
+
 	// API settings
 	API struct {
 		MaxResponseItems int
@@ -280,6 +290,19 @@ func forcePathSeparator(path string) {
 	}
 }

+// IsRunUserMatchCurrentUser returns false if configured run user does not match
+// actual user that runs the app. The first return value is the actual user name.
+// This check is ignored under Windows since SSH remote login is not the main
+// method to login on Windows.
+func IsRunUserMatchCurrentUser(runUser string) (string, bool) {
+	if IsWindows {
+		return "", true
+	}
+
+	currentUser := user.CurrentUsername()
+	return currentUser, runUser == currentUser
+}
+
 // NewContext initializes configuration context.
 // NOTE: do not print any log except error.
 func NewContext() {
@@ -333,6 +356,7 @@ func NewContext() {
 		log.Fatal(4, "Invalid ROOT_URL '%s': %s", AppUrl, err)
 	}
 	// Suburl should start with '/' and end without '/', such as '/{subpath}'.
+	// This value is empty if site does not have sub-url.
 	AppSubUrl = strings.TrimSuffix(url.Path, "/")
 	AppSubUrlDepth = strings.Count(AppSubUrl, "/")

@@ -425,10 +449,12 @@ func NewContext() {
 	}[Cfg.Section("time").Key("FORMAT").MustString("RFC1123")]

 	RunUser = Cfg.Section("").Key("RUN_USER").String()
-	curUser := user.CurrentUsername()
 	// Does not check run user when the install lock is off.
-	if InstallLock && RunUser != curUser {
-		log.Fatal(4, "Expect user(%s) but current user is: %s", RunUser, curUser)
+	if InstallLock {
+		currentUser, match := IsRunUserMatchCurrentUser(RunUser)
+		if !match {
+			log.Fatal(4, "Expect user '%s' but current user is: %s", RunUser, currentUser)
+		}
 	}

 	// Determine and create root git repository path.
@@ -460,8 +486,27 @@ func NewContext() {
 		GravatarSource = source
 	}
 	DisableGravatar = sec.Key("DISABLE_GRAVATAR").MustBool()
+	EnableFederatedAvatar = sec.Key("ENABLE_FEDERATED_AVATAR").MustBool()
 	if OfflineMode {
 		DisableGravatar = true
+		EnableFederatedAvatar = false
+	}
+	if DisableGravatar {
+		EnableFederatedAvatar = false
+	}
+
+	if EnableFederatedAvatar {
+		LibravatarService = libravatar.New()
+		parts := strings.Split(GravatarSource, "/")
+		if len(parts) >= 3 {
+			if parts[0] == "https:" {
+				LibravatarService.SetUseHTTPS(true)
+				LibravatarService.SetSecureFallbackHost(parts[2])
+			} else {
+				LibravatarService.SetUseHTTPS(false)
+				LibravatarService.SetFallbackHost(parts[2])
+			}
+		}
 	}

 	if err = Cfg.Section("ui").MapTo(&UI); err != nil {
@@ -472,10 +517,16 @@ func NewContext() {
 		log.Fatal(4, "Fail to map Cron settings: %v", err)
 	} else if err = Cfg.Section("git").MapTo(&Git); err != nil {
 		log.Fatal(4, "Fail to map Git settings: %v", err)
+	} else if err = Cfg.Section("mirror").MapTo(&Mirror); err != nil {
+		log.Fatal(4, "Fail to map API settings: %v", err)
 	} else if err = Cfg.Section("api").MapTo(&API); err != nil {
 		log.Fatal(4, "Fail to map API settings: %v", err)
 	}

+	if Mirror.DefaultInterval <= 0 {
+		Mirror.DefaultInterval = 24
+	}
+
 	Langs = Cfg.Section("i18n").Key("LANGS").Strings(",")
 	Names = Cfg.Section("i18n").Key("NAMES").Strings(",")
 	dateLangs = Cfg.Section("i18n.datelang").KeysHash()
--- a/modules/template/template.go
+++ b/modules/template/template.go
@@ -96,7 +96,6 @@ func NewFuncMap() []template.FuncMap {
 		"ShortSha":          base.ShortSha,
 		"MD5":               base.EncodeMD5,
 		"ActionContent2Commits": ActionContent2Commits,
-		"ToUtf8":                ToUtf8,
 		"EscapePound": func(str string) string {
 			return strings.NewReplacer("%", "%25", "#", "%23", " ", "%20").Replace(str)
 		},
@@ -115,10 +114,6 @@ func Str2html(raw string) template.HTML {
 	return template.HTML(markdown.Sanitizer.Sanitize(raw))
 }

-func Range(l int) []int {
-	return make([]int, l)
-}
-
 func List(l *list.List) chan interface{} {
 	e := l.Front()
 	c := make(chan interface{})
@@ -136,7 +131,7 @@ func Sha1(str string) string {
 	return base.EncodeSha1(str)
 }

-func ToUtf8WithErr(content []byte) (error, string) {
+func ToUTF8WithErr(content []byte) (error, string) {
 	charsetLabel, err := base.DetectEncoding(content)
 	if err != nil {
 		return err, ""
@@ -159,8 +154,8 @@ func ToUtf8WithErr(content []byte) (error, string) {
 	return err, result
 }

-func ToUtf8(content string) string {
-	_, res := ToUtf8WithErr([]byte(content))
+func ToUTF8(content string) string {
+	_, res := ToUTF8WithErr([]byte(content))
 	return res
 }

--- a/public/config.codekit
+++ b/public/config.codekit
@@ -150,17 +150,6 @@
 		"outputStyle": 1,
 		"syntaxCheckerStyle": 1
 		},
-	"\/js\/jquery.are-you-sure.js": {
-		"fileType": 64,
-		"ignore": 1,
-		"ignoreWasSetByUser": 1,
-		"inputAbbreviatedPath": "\/js\/jquery.are-you-sure.js",
-		"outputAbbreviatedPath": "\/js\/min\/jquery.are-you-sure-min.js",
-		"outputPathIsOutsideProject": 0,
-		"outputPathIsSetByUser": 0,
-		"outputStyle": 1,
-		"syntaxCheckerStyle": 1
-		},
 	"\/js\/semantic-2.2.1.min.js": {
 		"fileType": 64,
 		"ignore": 1,
--- a/public/css/gogs.css
+++ b/public/css/gogs.css
@@ -1316,6 +1316,8 @@ footer .ui.language .menu {
 .repository.file.list #file-content .code-view .lines-num .hljs li,
 .repository.file.list #file-content .code-view .lines-code .hljs li {
  padding-left: 5px;
+  display: inline-block;
+  width: 100%;
 }
 .repository.file.list #file-content .code-view .lines-num pre li.active,
 .repository.file.list #file-content .code-view .lines-code pre li.active,
--- a/public/js/gogs.js
+++ b/public/js/gogs.js
@@ -187,9 +187,24 @@ function initInstall() {
        }
    });

+    // TODO: better handling of exclusive relations.
    $('#offline-mode input').change(function () {
        if ($(this).is(':checked')) {
            $('#disable-gravatar').checkbox('check');
+            $('#federated-avatar-lookup').checkbox('uncheck');
+        }
+    });
+    $('#disable-gravatar input').change(function () {
+        if ($(this).is(':checked')) {
+            $('#federated-avatar-lookup').checkbox('uncheck');
+        } else {
+            $('#offline-mode').checkbox('uncheck');
+        }
+    });
+    $('#federated-avatar-lookup input').change(function () {
+        if ($(this).is(':checked')) {
+            $('#disable-gravatar').checkbox('uncheck');
+            $('#offline-mode').checkbox('uncheck');
        }
    });
    $('#disable-registration input').change(function () {
@@ -1073,7 +1088,7 @@ $(window).load(function () {
                    b = c;
                }
                var classes = [];
-                for (i = a; i <= b; i++) {
+                for (var i = a; i <= b; i++) {
                    classes.push('.L' + i);
                }
                $list.filter(classes.join(',')).addClass('active');
@@ -1087,22 +1102,6 @@ $(window).load(function () {

    // Code view.
    if ($('.code-view .linenums').length > 0) {
-        var $block = $('.code-view .linenums');
-        var lines = $block.html().split("\n");
-        $block.html('');
-
-        var $num_list = $('.code-view .lines-num');
-
-        // Building blocks.
-        var $toappendblock = [];
-        var $toappendnum_list = [];
-        for (var i = 0; i < lines.length; i++) {
-            $toappendblock.push('<li class="L' + (i + 1) + '" rel="L' + (i + 1) + '">' + lines[i] + '</li>');
-            $toappendnum_list.push('<span id="L' + (i + 1) + '">' + (i + 1) + '</span>');
-        }
-        $block.append($toappendblock.join(''));
-        $num_list.append($toappendnum_list.join(''));
-
        $(document).on('click', '.lines-num span', function (e) {
            var $select = $(this);
            var $list = $select.parent().siblings('.lines-code').find('ol.linenums > li');
--- a/public/js/libs/jquery.are-you-sure.js
+++ b/public/js/libs/jquery.are-you-sure.js
--- a/public/less/_repository.less
+++ b/public/less/_repository.less
@@ -251,6 +251,8 @@
 						padding: 0 !important;
 						li {
 							padding-left: 5px;
+							display: inline-block;
+							width: 100%;
 							&.active {
 								background: #ffffdd;
 							}
--- a/routers/admin/admin.go
+++ b/routers/admin/admin.go
@@ -222,6 +222,9 @@ func Config(ctx *context.Context) {
 	ctx.Data["SessionConfig"] = setting.SessionConfig

 	ctx.Data["DisableGravatar"] = setting.DisableGravatar
+	ctx.Data["EnableFederatedAvatar"] = setting.EnableFederatedAvatar
+
+	ctx.Data["Git"] = setting.Git

 	type logger struct {
 		Mode, Config string
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -22,7 +22,7 @@ import (
 	"github.com/gogits/gogs/routers/api/v1/user"
 )

-func RepoAssignment() macaron.Handler {
+func repoAssignment() macaron.Handler {
 	return func(ctx *context.APIContext) {
 		userName := ctx.Params(":username")
 		repoName := ctx.Params(":reponame")
@@ -83,7 +83,7 @@ func RepoAssignment() macaron.Handler {
 }

 // Contexter middleware already checks token for user sign in process.
-func ReqToken() macaron.Handler {
+func reqToken() macaron.Handler {
 	return func(ctx *context.Context) {
 		if !ctx.IsSigned {
 			ctx.Error(401)
@@ -92,7 +92,7 @@ func ReqToken() macaron.Handler {
 	}
 }

-func ReqBasicAuth() macaron.Handler {
+func reqBasicAuth() macaron.Handler {
 	return func(ctx *context.Context) {
 		if !ctx.IsBasicAuth {
 			ctx.Error(401)
@@ -101,7 +101,7 @@ func ReqBasicAuth() macaron.Handler {
 	}
 }

-func ReqAdmin() macaron.Handler {
+func reqAdmin() macaron.Handler {
 	return func(ctx *context.Context) {
 		if !ctx.IsSigned || !ctx.User.IsAdmin {
 			ctx.Error(403)
@@ -110,7 +110,7 @@ func ReqAdmin() macaron.Handler {
 	}
 }

-func OrgAssignment(args ...bool) macaron.Handler {
+func orgAssignment(args ...bool) macaron.Handler {
 	var (
 		assignOrg  bool
 		assignTeam bool
@@ -151,6 +151,13 @@ func OrgAssignment(args ...bool) macaron.Handler {
 	}
 }

+func mustEnableIssues(ctx *context.APIContext) {
+	if !ctx.Repo.Repository.EnableIssues || ctx.Repo.Repository.EnableExternalTracker {
+		ctx.Status(404)
+		return
+	}
+}
+
 // RegisterRoutes registers all v1 APIs routes to web application.
 // FIXME: custom form error response
 func RegisterRoutes(m *macaron.Macaron) {
@@ -171,7 +178,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 				m.Group("/tokens", func() {
 					m.Combo("").Get(user.ListAccessTokens).
 						Post(bind(api.CreateAccessTokenOption{}), user.CreateAccessToken)
-				}, ReqBasicAuth())
+				}, reqBasicAuth())
 			})
 		})

@@ -185,7 +192,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 					m.Get("/:target", user.CheckFollowing)
 				})
 			})
-		}, ReqToken())
+		}, reqToken())

 		m.Group("/user", func() {
 			m.Combo("/emails").Get(user.ListEmails).
@@ -204,12 +211,12 @@ func RegisterRoutes(m *macaron.Macaron) {
 				m.Combo("/:id").Get(user.GetPublicKey).
 					Delete(user.DeletePublicKey)
 			})
-		}, ReqToken())
+		}, reqToken())

 		// Repositories
-		m.Combo("/user/repos", ReqToken()).Get(repo.ListMyRepos).
+		m.Combo("/user/repos", reqToken()).Get(repo.ListMyRepos).
 			Post(bind(api.CreateRepoOption{}), repo.Create)
-		m.Post("/org/:org/repos", ReqToken(), bind(api.CreateRepoOption{}), repo.CreateOrgRepo)
+		m.Post("/org/:org/repos", reqToken(), bind(api.CreateRepoOption{}), repo.CreateOrgRepo)

 		m.Group("/repos", func() {
 			m.Get("/search", repo.Search)
@@ -252,23 +259,23 @@ func RegisterRoutes(m *macaron.Macaron) {
 						})

 					})
-				})
+				}, mustEnableIssues)
 				m.Group("/labels", func() {
 					m.Combo("").Get(repo.ListLabels).
 						Post(bind(api.CreateLabelOption{}), repo.CreateLabel)
 					m.Combo("/:id").Get(repo.GetLabel).Patch(bind(api.EditLabelOption{}), repo.EditLabel).
 						Delete(repo.DeleteLabel)
 				})
-			}, RepoAssignment())
-		}, ReqToken())
+			}, repoAssignment())
+		}, reqToken())

 		// Organizations
-		m.Get("/user/orgs", ReqToken(), org.ListMyOrgs)
+		m.Get("/user/orgs", reqToken(), org.ListMyOrgs)
 		m.Get("/users/:username/orgs", org.ListUserOrgs)
 		m.Group("/orgs/:orgname", func() {
 			m.Combo("").Get(org.Get).Patch(bind(api.EditOrgOption{}), org.Edit)
 			m.Combo("/teams").Get(org.ListTeams)
-		}, OrgAssignment(true))
+		}, orgAssignment(true))

 		m.Any("/*", func(ctx *context.Context) {
 			ctx.Error(404)
@@ -289,15 +296,15 @@ func RegisterRoutes(m *macaron.Macaron) {

 			m.Group("/orgs/:orgname", func() {
 				m.Group("/teams", func() {
-					m.Post("", OrgAssignment(true), bind(api.CreateTeamOption{}), admin.CreateTeam)
+					m.Post("", orgAssignment(true), bind(api.CreateTeamOption{}), admin.CreateTeam)
 				})
 			})
 			m.Group("/teams", func() {
 				m.Group("/:teamid", func() {
 					m.Combo("/members/:username").Put(admin.AddTeamMember).Delete(admin.RemoveTeamMember)
 					m.Combo("/repos/:reponame").Put(admin.AddTeamRepository).Delete(admin.RemoveTeamRepository)
-				}, OrgAssignment(false, true))
+				}, orgAssignment(false, true))
 			})
-		}, ReqAdmin())
+		}, reqAdmin())
 	}, context.APIContexter())
 }
--- a/routers/api/v1/convert/convert.go
+++ b/routers/api/v1/convert/convert.go
@@ -69,15 +69,31 @@ func ToBranch(b *models.Branch, c *git.Commit) *api.Branch {
 }

 func ToCommit(c *git.Commit) *api.PayloadCommit {
+	authorUsername := ""
+	author, err := models.GetUserByEmail(c.Author.Email)
+	if err == nil {
+		authorUsername = author.Name
+	}
+	committerUsername := ""
+	committer, err := models.GetUserByEmail(c.Committer.Email)
+	if err == nil {
+		committerUsername = committer.Name
+	}
 	return &api.PayloadCommit{
 		ID:      c.ID.String(),
 		Message: c.Message(),
 		URL:     "Not implemented",
 		Author: &api.PayloadAuthor{
-			Name:  c.Committer.Name,
-			Email: c.Committer.Email,
-			/* UserName: c.Committer.UserName, */
+			Name:     c.Author.Name,
+			Email:    c.Author.Email,
+			UserName: authorUsername,
 		},
+		Committer: &api.PayloadCommitter{
+			Name:     c.Committer.Name,
+			Email:    c.Committer.Email,
+			UserName: committerUsername,
+		},
+		Timestamp: c.Author.When,
 	}
 }

--- a/routers/install.go
+++ b/routers/install.go
@@ -169,6 +169,7 @@ func Install(ctx *context.Context) {
 	// Server and other services settings
 	form.OfflineMode = setting.OfflineMode
 	form.DisableGravatar = setting.DisableGravatar
+	form.EnableFederatedAvatar = setting.EnableFederatedAvatar
 	form.DisableRegistration = setting.Service.DisableRegistration
 	form.EnableCaptcha = setting.Service.EnableCaptcha
 	form.RequireSignInView = setting.Service.RequireSignInView
@@ -227,7 +228,7 @@ func InstallPost(ctx *context.Context, form auth.InstallForm) {
 	if err := models.NewTestEngine(x); err != nil {
 		if strings.Contains(err.Error(), `Unknown database type: sqlite3`) {
 			ctx.Data["Err_DbType"] = true
-			ctx.RenderWithErr(ctx.Tr("install.sqlite3_not_available", "http://gogs.io/docs/installation/install_from_binary.html"), INSTALL, &form)
+			ctx.RenderWithErr(ctx.Tr("install.sqlite3_not_available", "https://gogs.io/docs/installation/install_from_binary.html"), INSTALL, &form)
 		} else {
 			ctx.Data["Err_DbSetting"] = true
 			ctx.RenderWithErr(ctx.Tr("install.invalid_db_setting", err), INSTALL, &form)
@@ -251,11 +252,10 @@ func InstallPost(ctx *context.Context, form auth.InstallForm) {
 		return
 	}

-	// Check run user.
-	curUser := user.CurrentUsername()
-	if form.RunUser != curUser {
+	currentUser, match := setting.IsRunUserMatchCurrentUser(form.RunUser)
+	if !match {
 		ctx.Data["Err_RunUser"] = true
-		ctx.RenderWithErr(ctx.Tr("install.run_user_not_match", form.RunUser, curUser), INSTALL, &form)
+		ctx.RenderWithErr(ctx.Tr("install.run_user_not_match", form.RunUser, currentUser), INSTALL, &form)
 		return
 	}

@@ -329,6 +329,7 @@ func InstallPost(ctx *context.Context, form auth.InstallForm) {

 	cfg.Section("server").Key("OFFLINE_MODE").SetValue(com.ToStr(form.OfflineMode))
 	cfg.Section("picture").Key("DISABLE_GRAVATAR").SetValue(com.ToStr(form.DisableGravatar))
+	cfg.Section("picture").Key("ENABLE_FEDERATED_AVATAR").SetValue(com.ToStr(form.EnableFederatedAvatar))
 	cfg.Section("service").Key("DISABLE_REGISTRATION").SetValue(com.ToStr(form.DisableRegistration))
 	cfg.Section("service").Key("ENABLE_CAPTCHA").SetValue(com.ToStr(form.EnableCaptcha))
 	cfg.Section("service").Key("REQUIRE_SIGNIN_VIEW").SetValue(com.ToStr(form.RequireSignInView))
--- a/routers/org/setting.go
+++ b/routers/org/setting.go
@@ -83,8 +83,8 @@ func SettingsPost(ctx *context.Context, form auth.UpdateOrgSettingForm) {
 	ctx.Redirect(ctx.Org.OrgLink + "/settings")
 }

-func SettingsAvatar(ctx *context.Context, form auth.UploadAvatarForm) {
-	form.Enable = true
+func SettingsAvatar(ctx *context.Context, form auth.AvatarForm) {
+	form.Source = auth.AVATAR_LOCAL
 	if err := user.UpdateAvatarSetting(ctx, form, ctx.Org.Organization); err != nil {
 		ctx.Flash.Error(err.Error())
 	} else {
--- a/routers/repo/download.go
+++ b/routers/repo/download.go
@@ -28,7 +28,7 @@ func ServeData(ctx *context.Context, name string, reader io.Reader) error {
 			ctx.Resp.Header().Set("Content-Disposition", "attachment; filename=\""+path.Base(ctx.Repo.TreeName)+"\"")
 			ctx.Resp.Header().Set("Content-Transfer-Encoding", "binary")
 		}
-	} else {
+	} else if !ctx.QueryBool("render") {
 		ctx.Resp.Header().Set("Content-Type", "text/plain; charset=utf-8")
 	}
 	ctx.Resp.Write(buf)
--- a/routers/repo/issue.go
+++ b/routers/repo/issue.go
@@ -52,7 +52,7 @@ var (
 )

 func MustEnableIssues(ctx *context.Context) {
-	if !ctx.Repo.Repository.EnableIssues {
+	if !ctx.Repo.Repository.EnableIssues || ctx.Repo.Repository.EnableExternalTracker {
 		ctx.Handle(404, "MustEnableIssues", nil)
 		return
 	}
--- a/routers/repo/release.go
+++ b/routers/repo/release.go
@@ -167,6 +167,15 @@ func NewReleasePost(ctx *context.Context, form auth.NewReleaseForm) {
 		return
 	}

+	var tagCreatedUnix int64
+	tag, err := ctx.Repo.GitRepo.GetTag(form.TagName)
+	if err == nil {
+		commit, err := tag.Commit()
+		if err == nil {
+			tagCreatedUnix = commit.Author.When.Unix()
+		}
+	}
+
 	commit, err := ctx.Repo.GitRepo.GetBranchCommit(form.Target)
 	if err != nil {
 		ctx.Handle(500, "GetBranchCommit", err)
@@ -190,6 +199,7 @@ func NewReleasePost(ctx *context.Context, form auth.NewReleaseForm) {
 		Note:         form.Content,
 		IsDraft:      len(form.Draft) > 0,
 		IsPrerelease: form.Prerelease,
+		CreatedUnix:  tagCreatedUnix,
 	}

 	if err = models.CreateRelease(ctx.Repo.GitRepo, rel); err != nil {
--- a/routers/repo/view.go
+++ b/routers/repo/view.go
@@ -6,6 +6,8 @@ package repo

 import (
 	"bytes"
+	"fmt"
+	gotemplate "html/template"
 	"io/ioutil"
 	"path"
 	"strings"
@@ -116,14 +118,29 @@ func Home(ctx *context.Context) {
 					if readmeExist {
 						ctx.Data["FileContent"] = string(markdown.Render(buf, path.Dir(treeLink), ctx.Repo.Repository.ComposeMetas()))
 					} else {
-						if err, content := template.ToUtf8WithErr(buf); err != nil {
+						// Building code view blocks with line number on server side.
+						var filecontent string
+						if err, content := template.ToUTF8WithErr(buf); err != nil {
 							if err != nil {
-								log.Error(4, "Convert content encoding: %s", err)
+								log.Error(4, "ToUTF8WithErr: %s", err)
 							}
-							ctx.Data["FileContent"] = string(buf)
+							filecontent = string(buf)
 						} else {
-							ctx.Data["FileContent"] = content
+							filecontent = content
 						}
+
+						var output bytes.Buffer
+						lines := strings.Split(filecontent, "\n")
+						for index, line := range lines {
+							output.WriteString(fmt.Sprintf(`<li class="L%d" rel="L%d">%s</li>`, index+1, index+1, gotemplate.HTMLEscapeString(line)) + "\n")
+						}
+						ctx.Data["FileContent"] = gotemplate.HTML(output.String())
+
+						output.Reset()
+						for i := 0; i < len(lines); i++ {
+							output.WriteString(fmt.Sprintf(`<span id="L%d">%d</span>`, i+1, i+1))
+						}
+						ctx.Data["LineNums"] = gotemplate.HTML(output.String())
 					}
 				}
 			}
@@ -209,21 +226,21 @@ func Home(ctx *context.Context) {
 	ctx.Data["Reponame"] = repoName

 	var treenames []string
-	Paths := make([]string, 0)
+	paths := make([]string, 0)

 	if len(treename) > 0 {
 		treenames = strings.Split(treename, "/")
-		for i, _ := range treenames {
-			Paths = append(Paths, strings.Join(treenames[0:i+1], "/"))
+		for i := range treenames {
+			paths = append(paths, strings.Join(treenames[0:i+1], "/"))
 		}

 		ctx.Data["HasParentPath"] = true
-		if len(Paths)-2 >= 0 {
-			ctx.Data["ParentPath"] = "/" + Paths[len(Paths)-2]
+		if len(paths)-2 >= 0 {
+			ctx.Data["ParentPath"] = "/" + paths[len(paths)-2]
 		}
 	}

-	ctx.Data["Paths"] = Paths
+	ctx.Data["Paths"] = paths
 	ctx.Data["TreeName"] = treename
 	ctx.Data["Treenames"] = treenames
 	ctx.Data["TreePath"] = treePath
--- a/routers/repo/webhook.go
+++ b/routers/repo/webhook.go
@@ -359,6 +359,10 @@ func TestWebhook(ctx *context.Context) {
 					Name:  ctx.Repo.Commit.Author.Name,
 					Email: ctx.Repo.Commit.Author.Email,
 				},
+				Committer: &api.PayloadCommitter{
+					Name:  ctx.Repo.Commit.Committer.Name,
+					Email: ctx.Repo.Commit.Committer.Email,
+				},
 			},
 		},
 		Repo: ctx.Repo.Repository.ComposePayload(),
--- a/routers/user/home.go
+++ b/routers/user/home.go
@@ -77,7 +77,7 @@ func retrieveFeeds(ctx *context.Context, ctxUser *models.User, userID, offset in
 				ctx.Handle(500, "GetUserByName", err)
 				return
 			}
-			unameAvatars[act.ActUserName] = u.AvatarLink()
+			unameAvatars[act.ActUserName] = u.RelAvatarLink()
 		}

 		act.ActAvatar = unameAvatars[act.ActUserName]
@@ -202,7 +202,7 @@ func Issues(ctx *context.Context) {
 	var err error
 	var repos []*models.Repository
 	if ctxUser.IsOrganization() {
-		repos, _, err = ctxUser.GetUserRepositories(ctx.User.ID, 1, ctx.User.NumRepos)
+		repos, _, err = ctxUser.GetUserRepositories(ctx.User.ID, 1, ctxUser.NumRepos)
 		if err != nil {
 			ctx.Handle(500, "GetRepositories", err)
 			return
@@ -220,7 +220,8 @@ func Issues(ctx *context.Context) {
 	showRepos := make([]*models.Repository, 0, len(repos))
 	for _, repo := range repos {
 		if (isPullList && repo.NumPulls == 0) ||
-			(!isPullList && repo.NumIssues == 0) {
+			(!isPullList &&
+				(!repo.EnableIssues || repo.EnableExternalTracker || repo.NumIssues == 0)) {
 			continue
 		}

--- a/routers/user/setting.go
+++ b/routers/user/setting.go
@@ -22,6 +22,7 @@ import (

 const (
 	SETTINGS_PROFILE      base.TplName = "user/settings/profile"
+	SETTINGS_AVATAR       base.TplName = "user/settings/avatar"
 	SETTINGS_PASSWORD     base.TplName = "user/settings/password"
 	SETTINGS_EMAILS       base.TplName = "user/settings/email"
 	SETTINGS_SSH_KEYS     base.TplName = "user/settings/sshkeys"
@@ -91,10 +92,6 @@ func SettingsPost(ctx *context.Context, form auth.UpdateProfileForm) {
 	ctx.User.Email = form.Email
 	ctx.User.Website = form.Website
 	ctx.User.Location = form.Location
-	if len(form.Gravatar) > 0 {
-		ctx.User.Avatar = base.EncodeMD5(form.Gravatar)
-		ctx.User.AvatarEmail = form.Gravatar
-	}
 	if err := models.UpdateUser(ctx.User); err != nil {
 		ctx.Handle(500, "UpdateUser", err)
 		return
@@ -106,8 +103,12 @@ func SettingsPost(ctx *context.Context, form auth.UpdateProfileForm) {
 }

 // FIXME: limit size.
-func UpdateAvatarSetting(ctx *context.Context, form auth.UploadAvatarForm, ctxUser *models.User) error {
-	ctxUser.UseCustomAvatar = form.Enable
+func UpdateAvatarSetting(ctx *context.Context, form auth.AvatarForm, ctxUser *models.User) error {
+	ctxUser.UseCustomAvatar = form.Source == auth.AVATAR_LOCAL
+	if len(form.Gravatar) > 0 {
+		ctxUser.Avatar = base.EncodeMD5(form.Gravatar)
+		ctxUser.AvatarEmail = form.Gravatar
+	}

 	if form.Avatar != nil {
 		fr, err := form.Avatar.Open()
@@ -129,7 +130,7 @@ func UpdateAvatarSetting(ctx *context.Context, form auth.UploadAvatarForm, ctxUs
 	} else {
 		// No avatar is uploaded but setting has been changed to enable,
 		// generate a random one when needed.
-		if form.Enable && !com.IsFile(ctxUser.CustomAvatarPath()) {
+		if ctxUser.UseCustomAvatar && !com.IsFile(ctxUser.CustomAvatarPath()) {
 			if err := ctxUser.GenerateRandomAvatar(); err != nil {
 				log.Error(4, "GenerateRandomAvatar[%d]: %v", ctxUser.ID, err)
 			}
@@ -143,14 +144,20 @@ func UpdateAvatarSetting(ctx *context.Context, form auth.UploadAvatarForm, ctxUs
 	return nil
 }

-func SettingsAvatar(ctx *context.Context, form auth.UploadAvatarForm) {
+func SettingsAvatar(ctx *context.Context) {
+	ctx.Data["Title"] = ctx.Tr("settings")
+	ctx.Data["PageIsSettingsAvatar"] = true
+	ctx.HTML(200, SETTINGS_AVATAR)
+}
+
+func SettingsAvatarPost(ctx *context.Context, form auth.AvatarForm) {
 	if err := UpdateAvatarSetting(ctx, form, ctx.User); err != nil {
 		ctx.Flash.Error(err.Error())
 	} else {
 		ctx.Flash.Success(ctx.Tr("settings.update_avatar_success"))
 	}

-	ctx.Redirect(setting.AppSubUrl + "/user/settings")
+	ctx.Redirect(setting.AppSubUrl + "/user/settings/avatar")
 }

 func SettingsDeleteAvatar(ctx *context.Context) {
@@ -158,7 +165,7 @@ func SettingsDeleteAvatar(ctx *context.Context) {
 		ctx.Flash.Error(err.Error())
 	}

-	ctx.Redirect(setting.AppSubUrl + "/user/settings")
+	ctx.Redirect(setting.AppSubUrl + "/user/settings/avatar")
 }

 func SettingsPassword(ctx *context.Context) {
--- a/scripts/README
+++ b/scripts/README
@@ -0,0 +1 @@
+All files in subdirectories are templates, do modifications based on your environment first.
--- a/scripts/windows/install-as-service.bat
+++ b/scripts/windows/install-as-service.bat
@@ -9,7 +9,7 @@
 :: Make sure Gogs work running manually with "gogs web" before running
 :: this script.
 :: And, please, read carefully the installation docs first:
-:: http://gogs.io/docs/installation
+:: https://gogs.io/docs/installation
 :: To unistall the service, run "nssm remove gogs" and restart Windows.

 :: Set the folder where you extracted Gogs. Omit the last slash.
--- a/templates/.VERSION
+++ b/templates/.VERSION
@@ -1 +1 @@
-0.9.60.0803
+0.9.71.0809
--- a/templates/admin/config.tmpl
+++ b/templates/admin/config.tmpl
@@ -156,7 +156,7 @@
 							<dt>{{.i18n.Tr "admin.config.mailer_host"}}</dt>
 							<dd>{{.Mailer.Host}}</dd>
 							<dt>{{.i18n.Tr "admin.config.mailer_user"}}</dt>
-							<dd>{{.Mailer.User}}</dd><br>
+							<dd>{{if .Mailer.User}}{{.Mailer.User}}{{else}}(empty){{end}}</dd><br>
 							<form class="ui form" action="{{AppSubUrl}}/admin/config/test_mail" method="post">
 								{{.CsrfTokenHtml}}
 								<div class="inline field ui left">
@@ -179,8 +179,10 @@
 						<dd>{{.CacheAdapter}}</dd>
 						<dt>{{.i18n.Tr "admin.config.cache_interval"}}</dt>
 						<dd>{{.CacheInternal}} {{.i18n.Tr "tool.raw_seconds"}}</dd>
+						{{if .CacheConn}}
 						<dt>{{.i18n.Tr "admin.config.cache_conn"}}</dt>
-						<dd><pre>{{.CacheConn}}</pre></dd>
+						<dd><code>{{.CacheConn}}</code></dd>
+						{{end}}
 					</dl>
 				</div>

@@ -192,7 +194,7 @@
 						<dt>{{.i18n.Tr "admin.config.session_provider"}}</dt>
 						<dd>{{.SessionConfig.Provider}}</dd>
 						<dt>{{.i18n.Tr "admin.config.provider_config"}}</dt>
-						<dd><pre>{{.SessionConfig.ProviderConfig}}</pre></dd>
+						<dd><code>{{.SessionConfig.ProviderConfig}}</code></dd>
 						<dt>{{.i18n.Tr "admin.config.cookie_name"}}</dt>
 						<dd>{{.SessionConfig.CookieName}}</dd>
 						<dt>{{.i18n.Tr "admin.config.gc_interval_time"}}</dt>
@@ -213,6 +215,40 @@
 					<dl class="dl-horizontal admin-dl-horizontal">
 						<dt>{{.i18n.Tr "admin.config.disable_gravatar"}}</dt>
 						<dd><i class="fa fa{{if .DisableGravatar}}-check{{end}}-square-o"></i></dd>
+						<div class="ui divider"></div>
+						<dt>{{.i18n.Tr "admin.config.enable_federated_avatar"}}</dt>
+						<dd><i class="fa fa{{if .EnableFederatedAvatar}}-check{{end}}-square-o"></i></dd>
+					</dl>
+				</div>
+
+				<h4 class="ui top attached header">
+					{{.i18n.Tr "admin.config.git_config"}}
+				</h4>
+				<div class="ui attached table segment">
+					<dl class="dl-horizontal admin-dl-horizontal">
+						<dt>{{.i18n.Tr "admin.config.git_disable_diff_highlight"}}</dt>
+						<dd><i class="fa fa{{if .Git.DisableDiffHighlight}}-check{{end}}-square-o"></i></dd>
+						<dt>{{.i18n.Tr "admin.config.git_max_diff_lines"}}</dt>
+						<dd>{{.Git.MaxGitDiffLines}}</dd>
+						<dt>{{.i18n.Tr "admin.config.git_max_diff_line_characters"}}</dt>
+						<dd>{{.Git.MaxGitDiffLineCharacters}}</dd>
+						<dt>{{.i18n.Tr "admin.config.git_max_diff_files"}}</dt>
+						<dd>{{.Git.MaxGitDiffFiles}}</dd>
+						<dt>{{.i18n.Tr "admin.config.git_gc_args"}}</dt>
+						<dd><code>{{.Git.GCArgs}}</code></dd>
+						<dt>{{.i18n.Tr "admin.config.git_max_diff_lines"}}</dt>
+						<dd>{{.Git.MaxGitDiffLines}}</dd>
+						<div class="ui divider"></div>
+						<dt>{{.i18n.Tr "admin.config.git_migrate_timeout"}}</dt>
+						<dd>{{.Git.Timeout.Migrate}} {{.i18n.Tr "tool.raw_seconds"}}</dd>
+						<dt>{{.i18n.Tr "admin.config.git_mirror_timeout"}}</dt>
+						<dd>{{.Git.Timeout.Mirror}} {{.i18n.Tr "tool.raw_seconds"}}</dd>
+						<dt>{{.i18n.Tr "admin.config.git_clone_timeout"}}</dt>
+						<dd>{{.Git.Timeout.Clone}} {{.i18n.Tr "tool.raw_seconds"}}</dd>
+						<dt>{{.i18n.Tr "admin.config.git_pull_timeout"}}</dt>
+						<dd>{{.Git.Timeout.Pull}} {{.i18n.Tr "tool.raw_seconds"}}</dd>
+						<dt>{{.i18n.Tr "admin.config.git_gc_timeout"}}</dt>
+						<dd>{{.Git.Timeout.GC}} {{.i18n.Tr "tool.raw_seconds"}}</dd>
 					</dl>
 				</div>

@@ -225,7 +261,7 @@
 							<dt>{{$.i18n.Tr "admin.config.log_mode"}}</dt>
 							<dd>{{.Mode}}</dd>
 							<dt>{{$.i18n.Tr "admin.config.log_config"}}</dt>
-							<dd><pre>{{.Config}}</pre></dd>
+							<dd><code>{{.Config}}</code></dd>
 						{{end}}
 					</dl>
 				</div>
--- a/templates/base/footer.tmpl
+++ b/templates/base/footer.tmpl
@@ -24,7 +24,7 @@
 						{{end}}
 					</div>
 				</div>
-				<a target="_blank" href="http://gogs.io">{{.i18n.Tr "website"}}</a>
+				<a target="_blank" href="https://gogs.io">{{.i18n.Tr "website"}}</a>
 				{{if (or .ShowFooterVersion .PageIsAdmin)}}<span class="version">{{GoVer}}</span>{{end}}
 			</div>
 		</div>
--- a/templates/base/head.tmpl
+++ b/templates/base/head.tmpl
@@ -17,7 +17,7 @@
 	<link rel="shortcut icon" href="{{AppSubUrl}}/img/favicon.png" />

 	<script src="{{AppSubUrl}}/js/jquery-1.11.3.min.js"></script>
-	<script src="{{AppSubUrl}}/js/jquery.are-you-sure.js"></script>
+	<script src="{{AppSubUrl}}/js/libs/jquery.are-you-sure.js"></script>
 	<link rel="stylesheet" href="{{AppSubUrl}}/assets/font-awesome-4.6.3/css/font-awesome.min.css">
 	<link rel="stylesheet" href="{{AppSubUrl}}/assets/octicons-4.3.0/octicons.min.css">

@@ -90,7 +90,7 @@

 										<div class="ui dropdown head link jump item poping up" tabindex="-1" data-content="{{.i18n.Tr "user_profile_and_more"}}" data-variation="tiny inverted">
 											<span class="text avatar">
-												<img class="ui small rounded image" src="{{.SignedUser.AvatarLink}}">
+												<img class="ui small rounded image" src="{{.SignedUser.RelAvatarLink}}">
 												<span class="sr-only">{{.i18n.Tr "user_profile_and_more"}}</span>
 												<i class="octicon octicon-triangle-down" tabindex="-1"></i>
 											</span>
@@ -108,7 +108,7 @@
 													<i class="octicon octicon-settings"></i>
 													{{.i18n.Tr "your_settings"}}<!-- Your settings -->
 												</a>
-												<a class="item" target="_blank" href="http://gogs.io/docs" rel="noreferrer">
+												<a class="item" target="_blank" href="https://gogs.io/docs" rel="noreferrer">
 													<i class="octicon octicon-question"></i>
 													{{.i18n.Tr "help"}}<!-- Help -->
 												</a>
@@ -132,7 +132,7 @@

 								{{else}}

-									<a class="item" target="_blank" href="http://gogs.io/docs" rel="noreferrer">{{.i18n.Tr "help"}}</a>
+									<a class="item" target="_blank" href="https://gogs.io/docs" rel="noreferrer">{{.i18n.Tr "help"}}</a>
 									<div class="right menu">
 										{{if .ShowRegistrationButton}}
 											<a class="item{{if .PageIsSignUp}} active{{end}}" href="{{AppSubUrl}}/user/sign_up">
--- a/templates/explore/users.tmpl
+++ b/templates/explore/users.tmpl
@@ -9,7 +9,7 @@
 				<div class="ui user list">
 					{{range .Users}}
 						<div class="item">
-						  <img class="ui avatar image" src="{{.AvatarLink}}">
+						  <img class="ui avatar image" src="{{.RelAvatarLink}}">
 						  <div class="content">
 						  	<span class="header"><a href="{{.HomeLink}}">{{.Name}}</a> {{.FullName}}</span>
 						    <div class="description">
--- a/templates/home.tmpl
+++ b/templates/home.tmpl
@@ -20,7 +20,7 @@
 					<i class="octicon octicon-flame"></i> Einfach zu installieren
 				</h1>
 				<p class="large">
-					Starte einfach <a target="_blank" href="http://gogs.io/docs/installation/install_from_binary.html">die Anwendung</a> für deine Plattform. Gogs gibt es auch für <a target="_blank" href="https://github.com/gogits/gogs/tree/master/docker">Docker</a>, <a target="_blank" href="https://github.com/geerlingguy/ansible-vagrant-examples/tree/master/gogs">Vagrant</a> oder als <a target="_blank" href="http://gogs.io/docs/installation/install_from_packages.html">Installationspaket</a>.
+					Starte einfach <a target="_blank" href="https://gogs.io/docs/installation/install_from_binary.html">die Anwendung</a> für deine Plattform. Gogs gibt es auch für <a target="_blank" href="https://github.com/gogits/gogs/tree/master/docker">Docker</a>, <a target="_blank" href="https://github.com/geerlingguy/ansible-vagrant-examples/tree/master/gogs">Vagrant</a> oder als <a target="_blank" href="https://gogs.io/docs/installation/install_from_packages.html">Installationspaket</a>.
 				</p>
 			</div>
 			<div class="eight wide center column">
@@ -57,7 +57,7 @@
 					<i class="octicon octicon-flame"></i> 易安装
 				</h1>
 				<p class="large">
-					您除了可以根据操作系统平台通过 <a target="_blank" href="http://gogs.io/docs/installation/install_from_binary.html">二进制运行</a>，还可以通过 <a target="_blank" href="https://github.com/gogits/gogs/tree/master/docker">Docker</a> 或 <a target="_blank" href="https://github.com/geerlingguy/ansible-vagrant-examples/tree/master/gogs">Vagrant</a>，以及 <a target="_blank" href="http://gogs.io/docs/installation/install_from_packages.html">包管理</a> 安装。
+					您除了可以根据操作系统平台通过 <a target="_blank" href="https://gogs.io/docs/installation/install_from_binary.html">二进制运行</a>，还可以通过 <a target="_blank" href="https://github.com/gogits/gogs/tree/master/docker">Docker</a> 或 <a target="_blank" href="https://github.com/geerlingguy/ansible-vagrant-examples/tree/master/gogs">Vagrant</a>，以及 <a target="_blank" href="https://gogs.io/docs/installation/install_from_packages.html">包管理</a> 安装。
 				</p>
 			</div>
 			<div class="eight wide center column">
@@ -94,10 +94,10 @@
 					<i class="octicon octicon-flame"></i> Facile à installer
 				</h1>
 				<p class="large">
-				    Il suffit de <a target="_blank" href="http://gogs.io/docs/installation/install_from_binary.html">lancer l'exécutable</a> correspondant à votre système. 
+				    Il suffit de <a target="_blank" href="https://gogs.io/docs/installation/install_from_binary.html">lancer l'exécutable</a> correspondant à votre système. 
                    Ou d'utiliser Gogs avec <a target="_blank" href="https://github.com/gogits/gogs/tree/master/docker">Docker</a> ou 
                    <a target="_blank" href="https://github.com/geerlingguy/ansible-vagrant-examples/tree/master/gogs">Vagrant</a>
-                    ou en l'installant depuis un <a target="_blank" href="http://gogs.io/docs/installation/install_from_packages.html">package</a>.
+                    ou en l'installant depuis un <a target="_blank" href="https://gogs.io/docs/installation/install_from_packages.html">package</a>.
 				</p>
 			</div>
 			<div class="eight wide center column">
@@ -134,7 +134,7 @@
 					<i class="octicon octicon-flame"></i> Fácil de instalar
 				</h1>
 				<p class="large">
-					Simplemente <a target="_blank" href="http://gogs.io/docs/installation/install_from_binary.html">arranca el binario</a> para tu plataforma. O usa Gogs con <a target="_blank" href="https://github.com/gogits/gogs/tree/master/docker">Docker</a> o <a target="_blank" href="https://github.com/geerlingguy/ansible-vagrant-examples/tree/master/gogs">Vagrant</a>, o utilice el <a target="_blank" href="http://gogs.io/docs/installation/install_from_packages.html">paquete</a>.
+					Simplemente <a target="_blank" href="https://gogs.io/docs/installation/install_from_binary.html">arranca el binario</a> para tu plataforma. O usa Gogs con <a target="_blank" href="https://github.com/gogits/gogs/tree/master/docker">Docker</a> o <a target="_blank" href="https://github.com/geerlingguy/ansible-vagrant-examples/tree/master/gogs">Vagrant</a>, o utilice el <a target="_blank" href="https://gogs.io/docs/installation/install_from_packages.html">paquete</a>.
 				</p>
 			</div>
 			<div class="eight wide center column">
@@ -171,7 +171,7 @@
 					<i class="octicon octicon-flame"></i> Fácil de instalar
 				</h1>
 				<p class="large">
-					Simplesmente <a target="_blank" href="http://gogs.io/docs/installation/install_from_binary.html">rode o executável</a> para o seu sistema operacional. Ou obtenha o Gogs com o <a target="_blank" href="https://github.com/gogits/gogs/tree/master/docker">Docker</a> ou <a target="_blank" href="https://github.com/geerlingguy/ansible-vagrant-examples/tree/master/gogs">Vagrant</a>, ou baixe o <a target="_blank" href="http://gogs.io/docs/installation/install_from_packages.html">pacote</a>.
+					Simplesmente <a target="_blank" href="https://gogs.io/docs/installation/install_from_binary.html">rode o executável</a> para o seu sistema operacional. Ou obtenha o Gogs com o <a target="_blank" href="https://github.com/gogits/gogs/tree/master/docker">Docker</a> ou <a target="_blank" href="https://github.com/geerlingguy/ansible-vagrant-examples/tree/master/gogs">Vagrant</a>, ou baixe o <a target="_blank" href="https://gogs.io/docs/installation/install_from_packages.html">pacote</a>.
 				</p>
 			</div>
 			<div class="eight wide center column">
@@ -208,7 +208,7 @@
 					<i class="octicon octicon-flame"></i> Простой в установке
 				</h1>
 				<p class="large">
-					Просто <a target="_blank" href="http://gogs.io/docs/installation/install_from_binary.html">запустите исполняемый файл</a> для вашей платформы. Изпользуйте Gogs с <a target="_blank" href="https://github.com/gogits/gogs/tree/master/docker">Docker</a> или <a target="_blank" href="https://github.com/geerlingguy/ansible-vagrant-examples/tree/master/gogs">Vagrant</a>, или загрузите <a target="_blank" href="http://gogs.io/docs/installation/install_from_packages.html">пакет</a>.
+					Просто <a target="_blank" href="https://gogs.io/docs/installation/install_from_binary.html">запустите исполняемый файл</a> для вашей платформы. Изпользуйте Gogs с <a target="_blank" href="https://github.com/gogits/gogs/tree/master/docker">Docker</a> или <a target="_blank" href="https://github.com/geerlingguy/ansible-vagrant-examples/tree/master/gogs">Vagrant</a>, или загрузите <a target="_blank" href="https://gogs.io/docs/installation/install_from_packages.html">пакет</a>.
 				</p>
 			</div>
 			<div class="eight wide center column">
@@ -245,7 +245,7 @@
 					<i class="octicon octicon-flame"></i> Easy to install
 				</h1>
 				<p class="large">
-					Simply <a target="_blank" href="http://gogs.io/docs/installation/install_from_binary.html">run the binary</a> for your platform. Or ship Gogs with <a target="_blank" href="https://github.com/gogits/gogs/tree/master/docker">Docker</a> or <a target="_blank" href="https://github.com/geerlingguy/ansible-vagrant-examples/tree/master/gogs">Vagrant</a>, or get it <a target="_blank" href="http://gogs.io/docs/installation/install_from_packages.html">packaged</a>.
+					Simply <a target="_blank" href="https://gogs.io/docs/installation/install_from_binary.html">run the binary</a> for your platform. Or ship Gogs with <a target="_blank" href="https://github.com/gogits/gogs/tree/master/docker">Docker</a> or <a target="_blank" href="https://github.com/geerlingguy/ansible-vagrant-examples/tree/master/gogs">Vagrant</a>, or get it <a target="_blank" href="https://gogs.io/docs/installation/install_from_packages.html">packaged</a>.
 				</p>
 			</div>
 			<div class="eight wide center column">
--- a/templates/install.tmpl
+++ b/templates/install.tmpl
@@ -177,6 +177,12 @@
 									<input name="disable_gravatar" type="checkbox" {{if .disable_gravatar}}checked{{end}}>
 								</div>
 							</div>
+							<div class="inline field">
+								<div class="ui checkbox" id="federated-avatar-lookup">
+									<label class="poping up" data-content="{{.i18n.Tr "install.federated_avatar_lookup_popup"}}"><strong>{{.i18n.Tr "install.federated_avatar_lookup"}}</strong></label>
+									<input name="enable_federated_avatar" type="checkbox" {{if .enable_federated_avatar}}checked{{end}}>
+								</div>
+							</div>
 							<div class="inline field">
 								<div class="ui checkbox" id="disable-registration">
 									<label class="poping up" data-content="{{.i18n.Tr "install.disable_registration_popup"}}"><strong>{{.i18n.Tr "install.disable_registration"}}</strong></label>
--- a/templates/org/header.tmpl
+++ b/templates/org/header.tmpl
@@ -3,7 +3,7 @@
 		<div class="ui vertically grid head">
 			<div class="column">
 				<div class="ui header">
-					<img class="ui image" src="{{.AvatarLink}}?s=100">
+					<img class="ui image" src="{{.RelAvatarLink}}?s=100">
 					<span class="text thin grey"><a href="{{.HomeLink}}">{{.DisplayName}}</a></span>

 					<div class="ui right">
--- a/templates/org/home.tmpl
+++ b/templates/org/home.tmpl
@@ -3,7 +3,7 @@
 	<div class="ui container">
 		<div class="ui grid">
 			<div class="ui sixteen wide column">
-				<img class="ui left" id="org-avatar" src="{{.Org.AvatarLink}}?s=140"/>
+				<img class="ui left" id="org-avatar" src="{{.Org.RelAvatarLink}}?s=140"/>
 				<div id="org-info">
 					<div class="ui header">
 						{{.Org.DisplayName}}
@@ -48,7 +48,7 @@
 					{{$isMember := .IsOrganizationMember}}
 					{{range .Members}}
 						{{if or $isMember (.IsPublicMember $.Org.ID)}}
-							<a href="{{.HomeLink}}" title="{{.Name}}{{if .FullName}} ({{.FullName}}){{end}}"><img class="ui avatar" src="{{.AvatarLink}}"></a>
+							<a href="{{.HomeLink}}" title="{{.Name}}{{if .FullName}} ({{.FullName}}){{end}}"><img class="ui avatar" src="{{.RelAvatarLink}}"></a>
 						{{end}}
 					{{end}}
 				</div>
--- a/templates/org/member/members.tmpl
+++ b/templates/org/member/members.tmpl
@@ -14,7 +14,7 @@
 			{{range .Members}}
 				<div class="item ui grid">
 					<div class="ui one wide column">
-						<img class="ui avatar" src="{{.AvatarLink}}?s=48">
+						<img class="ui avatar" src="{{.RelAvatarLink}}?s=48">
 					</div>
 					<div class="ui three wide column">
 						<div class="meta"><a href="{{.HomeLink}}">{{.Name}}</a></div>
--- a/templates/org/team/members.tmpl
+++ b/templates/org/team/members.tmpl
@@ -16,7 +16,7 @@
 								<a class="ui red small button right" href="{{$.OrgLink}}/teams/{{$.Team.LowerName}}/action/remove?uid={{.ID}}">{{$.i18n.Tr "org.members.remove"}}</a>
 							{{end}}
 							<a href="{{.HomeLink}}">
-								<img class="ui avatar image" src="{{.AvatarLink}}">
+								<img class="ui avatar image" src="{{.RelAvatarLink}}">
 								{{.DisplayName}}
 							</a>
 						</div>
--- a/templates/org/team/teams.tmpl
+++ b/templates/org/team/teams.tmpl
@@ -26,7 +26,7 @@
 					<div class="ui attached segment members">
 						{{range .Members}}
 							<a href="{{.HomeLink}}" title="{{.Name}}">
-								<img class="ui avatar image" src="{{.AvatarLink}}">
+								<img class="ui avatar image" src="{{.RelAvatarLink}}">
 							</a>
 						{{end}}
 					</div>
--- a/templates/repo/commits_table.tmpl
+++ b/templates/repo/commits_table.tmpl
@@ -30,7 +30,7 @@
 					<tr>
 						<td class="author">
 							{{if .User}}
-								<img class="ui avatar image" src="{{.User.AvatarLink}}" alt=""/>&nbsp;&nbsp;<a href="{{AppSubUrl}}/{{.User.Name}}">{{.Author.Name}}</a>
+								<img class="ui avatar image" src="{{.User.RelAvatarLink}}" alt=""/>&nbsp;&nbsp;<a href="{{AppSubUrl}}/{{.User.Name}}">{{.Author.Name}}</a>
 							{{else}}
 								<img class="ui avatar image" src="{{AvatarLink .Author.Email}}" alt=""/>&nbsp;&nbsp;{{.Author.Name}}
 							{{end}}
--- a/templates/repo/create.tmpl
+++ b/templates/repo/create.tmpl
@@ -14,18 +14,18 @@
 						<div class="ui selection owner dropdown">
 							<input type="hidden" id="uid" name="uid" value="{{.ContextUser.ID}}" required>
 							<span class="text">
-								<img class="ui mini image" src="{{.ContextUser.AvatarLink}}">
+								<img class="ui mini image" src="{{.ContextUser.RelAvatarLink}}">
 								{{.ContextUser.ShortName 20}}
 							</span>
 							<i class="dropdown icon"></i>
 							<div class="menu">
 								<div class="item" data-value="{{.SignedUser.ID}}">
-									<img class="ui mini image" src="{{.SignedUser.AvatarLink}}">
+									<img class="ui mini image" src="{{.SignedUser.RelAvatarLink}}">
 									{{.SignedUser.ShortName 20}}
 								</div>
 								{{range .Orgs}}
 									<div class="item" data-value="{{.ID}}">
-										<img class="ui mini image" src="{{.AvatarLink}}">
+										<img class="ui mini image" src="{{.RelAvatarLink}}">
 										{{.ShortName 20}}
 									</div>
 								{{end}}
@@ -58,10 +58,10 @@
 					<div class="ui divider"></div>

 					<div class="inline field">
-						<label>{{.i18n.Tr "repo.repo_lang"}}</label>
+						<label>.gitignore</label>
 						<div class="ui multiple search normal selection dropdown">
 							<input type="hidden" name="gitignores" value="{{.gitignores}}">
-							<div class="default text">{{.i18n.Tr "repo.repo_lang_helper"}}</div>
+							<div class="default text">{{.i18n.Tr "repo.repo_gitignore_helper"}}</div>
 							<div class="menu">
 								{{range .Gitignores}}
 									<div class="item" data-value="{{.}}">{{.}}</div>
--- a/templates/repo/diff.tmpl
+++ b/templates/repo/diff.tmpl
@@ -13,7 +13,7 @@
 			</div>
 			<div class="ui attached info segment">
 				{{if .Author}}
-					<img class="ui avatar image" src="{{.Author.AvatarLink}}" />
+					<img class="ui avatar image" src="{{.Author.RelAvatarLink}}" />
 					<a href="{{.Author.HomeLink}}"><strong>{{.Commit.Author.Name}}</strong></a> {{if .IsSigned}}<{{.Commit.Author.Email}}>{{end}}
 				{{else}}
 					<img class="ui avatar image" src="{{AvatarLink .Commit.Author.Email}}" />
--- a/templates/repo/forks.tmpl
+++ b/templates/repo/forks.tmpl
@@ -8,7 +8,7 @@
 		<div class="ui list">
 			{{range .Forks}}
 				<div class="item">
-					<img class="ui avatar image" src="{{.Owner.AvatarLink}}">
+					<img class="ui avatar image" src="{{.Owner.RelAvatarLink}}">
 					<div class="link">
 						<a href="{{AppSubUrl}}/{{.Owner.Name}}">{{.Owner.Name}}</a>
 						/
--- a/templates/repo/header.tmpl
+++ b/templates/repo/header.tmpl
@@ -52,7 +52,7 @@
 			<a class="{{if .PageIsViewCode}}active{{end}} item" href="{{.RepoLink}}">
 				<i class="octicon octicon-code"></i> {{.i18n.Tr "repo.code"}}
 			</a>
-			{{if .Repository.EnableIssues}}
+			{{if and .Repository.EnableIssues (not .Repository.EnableExternalTracker)}}
 				<a class="{{if .PageIsIssueList}}active{{end}} item" href="{{.RepoLink}}/issues">
 					<i class="octicon octicon-issue-opened"></i> {{.i18n.Tr "repo.issues"}} <span class="ui {{if not .Repository.NumOpenIssues}}gray{{else}}blue{{end}} small label">{{.Repository.NumOpenIssues}}</span>
 				</a>
--- a/templates/repo/issue/list.tmpl
+++ b/templates/repo/issue/list.tmpl
@@ -8,7 +8,7 @@
 				{{if .PageIsIssueList}}
 					<a class="ui green button" href="{{.RepoLink}}/issues/new">{{.i18n.Tr "repo.issues.new"}}</a>
 				{{else}}
-					<a class="ui green button {{if not .PullRequestCtx.Allowed}}disabled{{end}}" href="{{if not .PullRequestCtx.Allowed}}#{{else}}{{.PullRequestCtx.BaseRepo.Link}}/compare/{{.Repository.DefaultBranch}}...{{.PullRequestCtx.HeadInfo}}{{end}}">{{.i18n.Tr "repo.pulls.new"}}</a>
+					<a class="ui green button {{if not .PullRequestCtx.Allowed}}disabled{{end}}" href="{{if .PullRequestCtx.Allowed}}{{.PullRequestCtx.BaseRepo.Link}}/compare/{{.Repository.DefaultBranch}}...{{.PullRequestCtx.HeadInfo}}{{end}}">{{.i18n.Tr "repo.pulls.new"}}</a>
 				{{end}}
 			</div>
 		</div>
@@ -61,7 +61,7 @@
 				<div class="menu">
 					<a class="item" href="{{$.Link}}?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&milestone={{$.MilestoneID}}">{{.i18n.Tr "repo.issues.filter_assginee_no_select"}}</a>
 					{{range .Assignees}}
-						<a class="{{if eq $.AssigneeID .ID}}active selected{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{$.MilestoneID}}&assignee={{.ID}}"><img src="{{.AvatarLink}}"> {{.Name}}</a>
+						<a class="{{if eq $.AssigneeID .ID}}active selected{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{$.MilestoneID}}&assignee={{.ID}}"><img src="{{.RelAvatarLink}}"> {{.Name}}</a>
 					{{end}}
 				</div>
 			</div>
@@ -121,7 +121,7 @@
 						{{end}}
 						{{if .Assignee}}
 							<a class="ui right assignee poping up" href="{{.Assignee.HomeLink}}" data-content="{{.Assignee.Name}}" data-variation="inverted" data-position="left center">
-								<img class="ui avatar image" src="{{.Assignee.AvatarLink}}">
+								<img class="ui avatar image" src="{{.Assignee.RelAvatarLink}}">
 							</a>
 						{{end}}
 					</p>
--- a/templates/repo/issue/new_form.tmpl
+++ b/templates/repo/issue/new_form.tmpl
@@ -9,7 +9,7 @@
 		<div class="ui comments">
 			<div class="comment">
 				<a class="avatar" href="{{.SignedUser.HomeLink}}">
-					<img src="{{.SignedUser.AvatarLink}}">
+					<img src="{{.SignedUser.RelAvatarLink}}">
 				</a>
 				<div class="ui segment content">
 					<div class="field">
@@ -104,7 +104,7 @@
 				<div class="menu">
 					<div class="no-select item">{{.i18n.Tr "repo.issues.new.clear_assignee"}}</div>
 					{{range .Assignees}}
-						<div class="item" data-id="{{.ID}}" data-href="{{$.RepoLink}}/issues?assignee={{.ID}}" data-avatar="{{.AvatarLink}}"><img src="{{.AvatarLink}}"> {{.Name}}</div>
+						<div class="item" data-id="{{.ID}}" data-href="{{$.RepoLink}}/issues?assignee={{.ID}}" data-avatar="{{.RelAvatarLink}}"><img src="{{.RelAvatarLink}}"> {{.Name}}</div>
 					{{end}}
 				</div>
 			</div>
@@ -112,7 +112,7 @@
 				<span class="no-select item {{if .Assignee}}hide{{end}}">{{.i18n.Tr "repo.issues.new.no_assignee"}}</span>
 				<div class="selected">
 					{{if .Assignee}}
-						<a class="item" href="{{.RepoLink}}/issues?assignee={{.Assignee.ID}}"><img class="ui avatar image" src="{{.Assignee.AvatarLink}}"> {{.Assignee.Name}}</a>
+						<a class="item" href="{{.RepoLink}}/issues?assignee={{.Assignee.ID}}"><img class="ui avatar image" src="{{.Assignee.RelAvatarLink}}"> {{.Assignee.Name}}</a>
 					{{end}}
 				</div>
 			</div>
--- a/templates/repo/issue/view_content.tmpl
+++ b/templates/repo/issue/view_content.tmpl
@@ -13,7 +13,7 @@
 		<ui class="ui comments">
 			<div class="comment">
 				<a class="avatar" {{if gt .Issue.Poster.ID 0}}href="{{.Issue.Poster.HomeLink}}"{{end}}>
-					<img src="{{.Issue.Poster.AvatarLink}}">
+					<img src="{{.Issue.Poster.RelAvatarLink}}">
 				</a>
 				<div class="content">
 					<div class="ui top attached header">
@@ -56,7 +56,7 @@
 				{{if eq .Type 0}}
 					<div class="comment" id="{{.HashTag}}">
 						<a class="avatar" {{if gt .Poster.ID 0}}href="{{.Poster.HomeLink}}"{{end}}>
-							<img src="{{.Poster.AvatarLink}}">
+							<img src="{{.Poster.RelAvatarLink}}">
 						</a>
 						<div class="content">
 							<div class="ui top attached header">
@@ -107,7 +107,7 @@
 					<div class="event">
 						<span class="octicon octicon-primitive-dot"></span>
 						<a class="ui avatar image" href="{{.Poster.HomeLink}}">
-							<img src="{{.Poster.AvatarLink}}">
+							<img src="{{.Poster.RelAvatarLink}}">
 						</a>
 						<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.reopened_at" .EventTag $createdStr | Safe}}</span>
 					</div>
@@ -115,7 +115,7 @@
 					<div class="event">
 						<span class="octicon octicon-circle-slash"></span>
 						<a class="ui avatar image" href="{{.Poster.HomeLink}}">
-							<img src="{{.Poster.AvatarLink}}">
+							<img src="{{.Poster.RelAvatarLink}}">
 						</a>
 						<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.closed_at" .EventTag $createdStr | Safe}}</span>
 					</div>
@@ -123,7 +123,7 @@
 					<div class="event">
 						<span class="octicon octicon-bookmark"></span>
 						<a class="ui avatar image" href="{{.Poster.HomeLink}}">
-							<img src="{{.Poster.AvatarLink}}">
+							<img src="{{.Poster.RelAvatarLink}}">
 						</a>
 						<span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.commit_ref_at" .EventTag $createdStr | Safe}}</span>

@@ -199,7 +199,7 @@
 			{{if .IsSigned}}
 				<div class="comment form">
 					<a class="avatar" href="{{.SignedUser.HomeLink}}">
-						<img src="{{.SignedUser.AvatarLink}}">
+						<img src="{{.SignedUser.RelAvatarLink}}">
 					</a>
 					<div class="content">
 						<form class="ui segment form" id="comment-form" action="{{$.RepoLink}}/issues/{{.Issue.Index}}/comments" method="post">
@@ -309,7 +309,7 @@
 				<div class="menu" data-action="update" data-update-url="{{$.RepoLink}}/issues/{{$.Issue.Index}}/assignee">
 					<div class="no-select item">{{.i18n.Tr "repo.issues.new.clear_assignee"}}</div>
 					{{range .Assignees}}
-						<div class="item" data-id="{{.ID}}" data-href="{{$.RepoLink}}/issues?assignee={{.ID}}" data-avatar="{{.AvatarLink}}"><img src="{{.AvatarLink}}"> {{.Name}}</div>
+						<div class="item" data-id="{{.ID}}" data-href="{{$.RepoLink}}/issues?assignee={{.ID}}" data-avatar="{{.RelAvatarLink}}"><img src="{{.RelAvatarLink}}"> {{.Name}}</div>
 					{{end}}
 				</div>
 			</div>
@@ -317,7 +317,7 @@
 				<span class="no-select item {{if .Issue.Assignee}}hide{{end}}">{{.i18n.Tr "repo.issues.new.no_assignee"}}</span>
 				<div class="selected">
 					{{if .Issue.Assignee}}
-						<a class="item" href="{{$.RepoLink}}/issues?assignee={{.Issue.Assignee.ID}}"><img class="ui avatar image" src="{{.Issue.Assignee.AvatarLink}}"> {{.Issue.Assignee.Name}}</a>
+						<a class="item" href="{{$.RepoLink}}/issues?assignee={{.Issue.Assignee.ID}}"><img class="ui avatar image" src="{{.Issue.Assignee.RelAvatarLink}}"> {{.Issue.Assignee.Name}}</a>
 					{{end}}
 				</div>
 			</div>
@@ -329,7 +329,7 @@
 				<div>
 					{{range .Participants}}
 						<a href="{{.HomeLink}}">
-							<img class="ui avatar image poping up" src="{{.AvatarLink}}" data-content="{{.DisplayName}}" data-position="top center" data-variation="small inverted">
+							<img class="ui avatar image poping up" src="{{.RelAvatarLink}}" data-content="{{.DisplayName}}" data-position="top center" data-variation="small inverted">
 						</a>
 					{{end}}
 				</div>
--- a/templates/repo/migrate.tmpl
+++ b/templates/repo/migrate.tmpl
@@ -39,18 +39,18 @@
 						<div class="ui selection owner dropdown">
 							<input type="hidden" id="uid" name="uid" value="{{.ContextUser.ID}}" required>
 							<span class="text">
-								<img class="ui mini image" src="{{.ContextUser.AvatarLink}}">
+								<img class="ui mini image" src="{{.ContextUser.RelAvatarLink}}">
 								{{.ContextUser.ShortName 20}}
 							</span>
 							<i class="dropdown icon"></i>
 							<div class="menu">
 								<div class="item" data-value="{{.SignedUser.ID}}">
-									<img class="ui mini image" src="{{.SignedUser.AvatarLink}}">
+									<img class="ui mini image" src="{{.SignedUser.RelAvatarLink}}">
 									{{.SignedUser.ShortName 20}}
 								</div>
 								{{range .Orgs}}
 									<div class="item" data-value="{{.ID}}">
-										<img class="ui mini image" src="{{.AvatarLink}}">
+										<img class="ui mini image" src="{{.RelAvatarLink}}">
 										{{.ShortName 20}}
 									</div>
 								{{end}}
--- a/templates/repo/pulls/fork.tmpl
+++ b/templates/repo/pulls/fork.tmpl
@@ -14,19 +14,19 @@
 						<div class="ui selection owner dropdown">
 							<input type="hidden" id="uid" name="uid" value="{{.ContextUser.ID}}" required>
 							<span class="text">
-								<img class="ui mini image" src="{{.ContextUser.AvatarLink}}">
+								<img class="ui mini image" src="{{.ContextUser.RelAvatarLink}}">
 								{{.ContextUser.ShortName 20}}
 							</span>
 							<i class="dropdown icon"></i>
 							<div class="menu">
 								<div class="item" data-value="{{.SignedUser.ID}}">
-									<img class="ui mini image" src="{{.SignedUser.AvatarLink}}">
+									<img class="ui mini image" src="{{.SignedUser.RelAvatarLink}}">
 									{{.SignedUser.ShortName 20}}
 								</div>
 								{{range .Orgs}}
 									{{if .IsOwnedBy $.SignedUser.ID}}
 										<div class="item" data-value="{{.ID}}">
-											<img class="ui mini image" src="{{.AvatarLink}}">
+											<img class="ui mini image" src="{{.RelAvatarLink}}">
 											{{.ShortName 20}}
 										</div>
 									{{end}}
--- a/templates/repo/release/list.tmpl
+++ b/templates/repo/release/list.tmpl
@@ -41,7 +41,7 @@
 							</h3>
 							<p class="text grey">
 								<span class="author">
-									<img class="img-10" src="{{.Publisher.AvatarLink}}">
+									<img class="img-10" src="{{.Publisher.RelAvatarLink}}">
 									<a href="{{AppSubUrl}}/{{.Publisher.Name}}">{{.Publisher.Name}}</a>
 								</span>
 								{{if .Created}}<span class="time">{{TimeSince .Created $.Lang}}</span>{{end}}
--- a/templates/repo/settings/collaboration.tmpl
+++ b/templates/repo/settings/collaboration.tmpl
@@ -14,7 +14,7 @@
 						<div class="item ui grid">
 							<div class="ui five wide column">
 								<a href="{{AppSubUrl}}/{{.Name}}">
-									<img class="ui avatar image" src="{{.AvatarLink}}">
+									<img class="ui avatar image" src="{{.RelAvatarLink}}">
 									{{.DisplayName}}
 								</a>
 							</div>
--- a/templates/repo/settings/hook_gogs.tmpl
+++ b/templates/repo/settings/hook_gogs.tmpl
@@ -1,5 +1,5 @@
 {{if eq .HookType "gogs"}}
-	<p>{{.i18n.Tr "repo.settings.add_webhook_desc" "http://gogs.io/docs/features/webhook.html" | Str2html}}</p>
+	<p>{{.i18n.Tr "repo.settings.add_webhook_desc" "https://gogs.io/docs/features/webhook.html" | Str2html}}</p>
 	<form class="ui form" action="{{.BaseLink}}/settings/hooks/gogs/{{if .PageIsSettingsHooksNew}}new{{else}}{{.Webhook.ID}}{{end}}" method="post">
 		{{.CsrfTokenHtml}}
 		<div class="required field {{if .Err_PayloadURL}}error{{end}}">
--- a/templates/repo/user_cards.tmpl
+++ b/templates/repo/user_cards.tmpl
@@ -6,7 +6,7 @@
 		{{range .Cards}}
 			<li class="item ui segment">
 				<a href="{{.HomeLink}}">
-					<img class="avatar" src="{{.AvatarLink}}"/>
+					<img class="avatar" src="{{.RelAvatarLink}}"/>
 				</a>
 				<h3 class="name"><a href="{{.HomeLink}}">{{.DisplayName}}</a></h3>

--- a/templates/repo/view_file.tmpl
+++ b/templates/repo/view_file.tmpl
@@ -44,7 +44,7 @@
 						{{if .IsFileTooLarge}}
 							<td><strong>{{.i18n.Tr "repo.file_too_large"}}</strong></td>
 						{{else}}
-							<td class="lines-num"></td>
+							<td class="lines-num">{{.LineNums}}</td>
 							<td class="lines-code"><pre><code class="{{.HighlightClass}}"><ol class="linenums">{{.FileContent}}</ol></code></pre></td>
 						{{end}}
 						</tr>
--- a/templates/repo/view_list.tmpl
+++ b/templates/repo/view_list.tmpl
@@ -3,7 +3,7 @@
 		<tr>
 			<th class="four wide">
 				{{if .LastCommitUser}}
-					<img class="ui avatar image img-12" src="{{.LastCommitUser.AvatarLink}}" />
+					<img class="ui avatar image img-12" src="{{.LastCommitUser.RelAvatarLink}}" />
 					<a href="{{AppSubUrl}}/{{.LastCommitUser.Name}}"><strong>{{.LastCommit.Author.Name}}</strong></a>
 				{{else}}
 					<img class="ui avatar image img-12" src="{{AvatarLink .LastCommit.Author.Email}}" />
--- a/templates/user/dashboard/issues.tmpl
+++ b/templates/user/dashboard/issues.tmpl
@@ -72,7 +72,7 @@
 								{{$.i18n.Tr "repo.issues.opened_by" $timeStr .Poster.HomeLink .Poster.Name | Safe}}
 								{{if .Assignee}}
 									<a class="ui right assignee poping up" href="{{.Assignee.HomeLink}}" data-content="{{.Assignee.Name}}" data-variation="inverted" data-position="left center">
-										<img class="ui avatar image" src="{{.Assignee.AvatarLink}}">
+										<img class="ui avatar image" src="{{.Assignee.RelAvatarLink}}">
 									</a>
 								{{end}}
 							</p>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Unknwon	81e6f82caf	Update glide.lock and .gopmfile [CI SKIP]	2016-08-10 11:57:53 -07:00
Unknwon	29f76f3936	Update locales [CI SKIP]	2016-08-10 11:54:52 -07:00
lstahlman	ea192147ea	Add test pull request task on merging a PR. Fixes #3396 (#3425 )	2016-08-10 11:38:44 -07:00
Thibault Meyer	99812a80fd	Fix #3420 : Bad commit URL generation (#3424 )	2016-08-10 11:35:06 -07:00
Thibault Meyer	8ad92bb8a4	Verify list len before use it with IN (#3423 )	2016-08-10 11:06:51 -07:00
Unknwon	b85927e488	#3091 show Git configs on admin panel	2016-08-10 11:01:42 -07:00
Unknwon	87b408a2e5	Update bindata.go [CI SKIP]	2016-08-09 23:58:15 -07:00
Thibault Meyer	fc68fb951c	Feature #3398 : Redefine global mirror interval (#3409 ) * add mirror::GLOBAL_INTERVAL on app.ini * rename key to DEFAULT_INTERVAL * add key on default app.ini + move code	2016-08-09 23:47:16 -07:00
Unknwon	5448d29b2e	#3417 wrong dashboard issue count for create by you	2016-08-09 23:19:52 -07:00
Unknwon	bb51eb5188	Update cron revision [CI SKIP]	2016-08-09 22:02:51 -07:00
lstahlman	89f71b44f7	Add committer information to API and Webhooks. Also fixes #3271 (#3414 )	2016-08-09 22:01:57 -07:00
Unknwon	c5d4a9e046	#2907 Add commit timestamp to webhook	2016-08-09 18:28:06 -07:00
Unknwon	edd786446c	#3158 skip RUN_USER check on Windows	2016-08-09 17:41:18 -07:00
Unknwon	b0b88d9bc5	#3091 add config option for Git GC	2016-08-09 17:24:32 -07:00
Unknwon	15b0cbe318	#3007 update git-module require version	2016-08-09 17:15:48 -07:00
Unknwon	9f0c571238	Change LICENSE copyright holder name [CI SKIP]	2016-08-09 13:05:15 -07:00
Unknwon	f70343660d	Little code refactoring	2016-08-09 12:56:00 -07:00
Rory McNamara	c8b45ecc27	Render the Code view on the server (minus syntax highlighting) (#2942 ) * render code view server side * remove debug print * fix multiline selection bug * change string concatenation to bytes.Buffer for efficiency * Fix newlines added by previous for hljs * fix selection highlighting * make css changes in .less	2016-08-09 12:35:20 -07:00
Unknwon	9e8a8867ea	#3325 use correct word for .gitignore	2016-08-09 12:16:21 -07:00
lstahlman	2c82fc3edb	Fix for #3410 overall issues for organisations is limited to num_repos from the user (#3412 )	2016-08-09 10:00:42 -07:00
Unknwon	bbe866122d	#3406 fix regression of MustEnableIssues check	2016-08-09 09:39:55 -07:00
Unknwon	87954dbfeb	Adjust .codebeatsettings	2016-08-08 23:26:10 -07:00
lstahlman	699c71d319	Fix for #3401 Links of pull request comment email should use pulls URL (#3403 )	2016-08-08 22:40:05 -07:00
Unknwon	21f25799b4	Add codebeat files	2016-08-08 20:03:46 -07:00
Unknwon	90af997fec	#3399 500 for upstream pulls page if user has forked repository	2016-08-08 13:02:55 -07:00
Unknwon	b73318bc62	Fix 404 when comment on pulls and not using interal issue tracker	2016-08-08 11:29:50 -07:00
Unknwon	e5bf4281b5	#2825 early response 200 when ?go-get=1	2016-08-07 14:29:16 -07:00
Unknwon	0c2b9bbb2b	Update glide.lock and .gopmfile	2016-08-07 11:05:19 -07:00
Unknwon	99385db0c4	#3320 code cleanup	2016-08-07 11:01:47 -07:00
Sandro Santilli	90dd0657b5	Add support for federated avatars (#3320 ) * Add support for federated avatars Fixes #3105 Removes avatar fetching duplication code Adds an "Enable Federated Avatar" checkbox in user settings (defaults to unchecked) Moves avatar settings all in the same form, making local and remote avatars mutually exclusive Renames UploadAvatarForm to AvatarForm as it's not anymore only for uploading * Run gofmt on all modified files * Move Avatar form in its own page * Add go-libravatar dependency to vendor/ dir Hopefully helps with accepting the contribution. See also #3214 * Revert "Add go-libravatar dependency to vendor/ dir" This reverts commit a8cb93ae640bbb90f7d25012fc257bda9fae9b82. * Make federated avatar setting a global configuration Removes the per-user setting * Move avatar handling back to base tool, disable federated avatar in offline mode * Format, handle error * Properly set fallback host * Use unsupported github.com mirror for importing go-libravatar * Remove comment showing life exists outside of github.com ... pity, but contribution would not be accepted otherwise * Use Combo for Get and Post methods over /avatar * FEDERATED_AVATAR -> ENABLE_FEDERATED_AVATAR * Fix persistance of federated avatar lookup checkbox at install time * Federated Avatars -> Enable Federated Avatars * Use len(string) == 0 instead of string == "" * Move import line where it belong See https://github.com/Unknwon/go-code-convention/blob/master/en-US/import_packages.md Pity the import url is still the unofficial one, but oh well... * Save a line (and waste much more expensive time) * Remove redundant parens * Remove an empty line * Remove empty lines * Reorder lines to make diff smaller * Remove another newline Unknwon review got me start a fight against newlines * Move DISABLE_GRAVATAR and ENABLE_FEDERATED_AVATAR after OFFLINE_MODE On re-reading the diff I figured what Unknwon meant here: https://github.com/gogits/gogs/pull/3320/files#r73741106 * Remove newlines that weren't there before my intervention	2016-08-07 10:27:38 -07:00
Unknwon	ec92565f23	#3393 fix missing sub-url prefix in relative avatar link	2016-08-07 10:13:05 -07:00
Andrey Nering	2772791fda	Improve diff highlight (#3390 ) - Try to reduce memory allocations - Add possibility to disable diff highlight (can improve performance for large diffs) - Tweaking with cost for prettier (cleaner) diffs - Do not calculate diff when the number of removed lines in a block is not equal to the number of added lines (this usually resulted in ugly diffs)	2016-08-07 09:49:47 -07:00
Unknwon	08c976f811	Only do go vet on this codebase	2016-08-06 11:20:10 -07:00
Unknwon	72dd299ca0	Update .gitattributes	2016-08-06 10:36:40 -07:00
Thibault Meyer	30fda0f1ae	Fix #3315 : Release dont use tag creation date (#3374 ) * Fix #3315: Release dont use tag creation date * Simplify code and apply gofmt * remove useless block (ctx.Repo.GitRepo.GetTag) on EditReleasePost * apply gofmt on modified files	2016-08-06 10:02:15 -07:00
Unknwon	ab9c5fb5e7	#2593 allow render raw content Use URL query parameter render=1 to render content in raw mode.	2016-08-05 18:34:13 -07:00
rugk	28dc5bb566	Replace gogs.io http links with https version (#3386 )	2016-08-05 17:35:40 -07:00
Unknwon	cf6d321991	Ignore repository with issue disabled or use external tracker in dashboard issues	2016-08-05 12:46:26 -07:00
Unknwon	50422f1fc2	#3348 always use relative avatar link in the template	2016-08-05 12:12:54 -07:00
Unknwon	db3d393576	routers/api: rename handlers to be unexported	2016-08-04 17:08:01 -07:00
Unknwon	2f105f3979	#2162 completely disable builtin issue tracker when enable external tracker	2016-08-04 16:32:02 -07:00
				`@@ -0,0 +1 @@`
				`All files in subdirectories are templates, do modifications based on your environment first.`