From f271b134661be7b2f7641f3ca125477efb8155d3 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Tue, 9 Mar 2021 17:11:42 +0100
Subject: [PATCH 01/21] Changelog for 1.14.0-RC1

---
 CHANGELOG.md | 264 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 264 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f0e1ac7678c3..78b12e638b58e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,270 @@ This changelog goes through all the changes that have been made in each release
 without substantial changes to our git log; to see the highlights of what has
 been added to each release, please refer to the [blog](https://blog.gitea.io).
 
+## [1.14.0-RC1](https://github.com/go-gitea/gitea/releases/tag/v1.14.0) - 2021-03-09
+
+* BREAKING
+  * Fix access log (#14475)
+  * Move macaron to chi (#14293)
+  * Consolidate Logos and update README header (#14136)
+  * Inline manifest.json (#14038)
+  * Store repository data in data path if not previously set (#13991)
+  * gitea png to logo (#13974)
+  * Standardise logging of failed authentication attempts in internal SSH (#13962)
+  * Add markdown support in organization description (#13549)
+  * Improve users management through the CLI (#6001) (#10492)
+* FEATURES
+  * Repository transfer has to be confirmed, if user can not create repo for new owner (#14792)
+  * Allow blocking some email domains from registering an account (#14667)
+  * Comment - Reference in new issue (#14366)
+  * Add support to migrate from gogs (#14342)
+  * Add pager to the branches page (#14202)
+  * Minimal OpenID Connect implementation (#14139)
+  * Display current stopwatch in navbar (#14122)
+  * Display SVG files as images instead of text (#14101)
+  * Disable SSH key deletion of externally managed Keys (#13985)
+  * Add support for ed25519_sk and ecdsa_sk SSH keys (#13462)
+  * #12897 - add mastodon provider (#13293)
+  * Sendmail command (#13079)
+  * Create DB session provider(based on xorm) (#13031)
+  * Add dismiss review feature (#12674)
+  * Make manual merge autodetection optional and add manual merge as merge method (#12543)
+  * Dump github/gitlab/gitea repository data to a local directory and restore to gitea (#12244)
+* API
+  * [API] get pull, return head branch sha, even if deleted (#14931)
+  * [API] Export LFS & TimeTracking function status (#14753)
+  * Show Gitea version in swagger (#14654)
+  * Fix PATCH /repos/{owner}/{repo} panic (#14637)
+  * [API] Add Restricted Field to User (#14630)
+  * Add support for ref parameter to get raw file API (#14602)
+  * [API] Add affected files of commits to commit struct (#14579)
+  * [API] Add  delete release by tag & fix unreleased inconsistency (#14563)
+  * [API] Add pagination to ListBranches (#14524)
+  * enhancement: add signoff option in commit form (#14516)
+  * [API] GetRelease by tag only return release (#14397)
+  * Add MirrorInterval to the API (#14163)
+  * API: Make BasicAuth Prefix case insensitive (#14106)
+  * Add user filter to issueTrackedTimes, enable usage for issue managers (#14081)
+  * [API] Add ref to create/edit issue options & deprecated assignee (#13992)
+  * [API] Add Ref to Issue (#13946)
+  * Expose default theme in meta and API (#13809)
+  * Send error message when CSRF token is missing (#13676)
+  * [API] List, Check, Add & delete endpoints for repository teams (#13630)
+  * API: Admin EditUser: Make FullName, Email, Website & Location optional (#13562)
+  * [API] Add more filters to issues search (#13514)
+  * Delete tag API (#13358)
+  * Add review request api (#11355)
+* BUGFIXES
+  * Fix alignment of People and Teams right arrow on org homepage (#14924)
+  * Fix overdue marking of closed issues and milestones (#14923)
+  * Prevent panic when empty MilestoneID in repo/issue/list (#14911)
+  * Fix migration context data (#14910)
+  * Handle URLs with trailing / (#14852)
+  * Add CORS config on to /login/oauth/access_token endpoint (#14850)
+  * Make searching issues by keyword case insensitive on DB (#14848)
+  * Fix misleading sentence (#14829)
+  * Prevent use of double sub-path and incorrect asset path in manifest (#14827)
+  * fix link account ui (#14763)
+  * fix preview status switch button on wiki editor (#14742)
+  * Fix github download on migration (#14703)
+  * Fix svg spacing (#14638)
+  * Prevent adding nil label to .AddedLabels or .RemovedLabels (#14623)
+  * Truncated organizations name (#14615)
+  * Exclude the current dump file from the dump (#14606)
+  * Use OldRef instead of CommitSHA for DeleteBranch comments (#14604)
+  * Ensure memcache TTL cannot be over 30 days (#14592)
+  * Remove NULs byte arrays passed to PostProcess (#14587)
+  * Restore detection of branches are equal on compare page (#14586)
+  * Upgrade 'css-minimizer-webpack-plugin' to the latest version (#14527)
+  * Fix incorrect key name so registerManualConfirm works (#14455)
+  * Fix close/reopen with comment (#14436)
+  * Allow passcode invalid error to appear (#14371)
+  * escape branch names in compare url (#14364)
+  * label and milestone webhooks on issue/pull creation (#14363)
+  * Handle NotifyCreateRef as create branch in feeds (#14245)
+  * Prevent clipping input text in Chrome + Segoe UI Font (#14179)
+  * Fix UI on edit auth source page (#14137)
+  * Fix git.parseTagData (#14105)
+  * Refactor get tag to remove unnecessary steps (#14058)
+  * Fix integrations test error with space in CURDIR path (#14056)
+  * Dropdown triangle fixes (#14028)
+  * fix label of --id in admin delete user (#14005)
+  * Update HEAD to match defaultBranch in template generation (#13948)
+  * Fix action avatar loading (#13909)
+  * Fix issue participants (#13893)
+  * Repo avatar fixes (#13891)
+  * Fix avatar template error (#13833)
+  * Fix review request notification email links when external issue tracker is enabled (#13723)
+  * Fix blame line alignment (#13542)
+  * Include OriginalAuthor in Reaction constraint (#13505)
+  * Comments on review should have the same sha (#13448)
+  * Fix whitespace rendering in diff (#13415)
+  * Fixed git args duplication (#13411)
+  * Fix bug on release publisherid migrations (#13410)
+  * Fix --port setting (#13288)
+  * Keep database transactions not too big (#13254)
+  * go-version constraints ignore pre-releases (#13234)
+  * Handle and propagate errors when checking if paths are Dirs, Files or Exist (#13186)
+  * Update Mirror IsEmpty status on synchronize (#13185)
+  * Use GO variable in go-check target (#13146) (#13147)
+* ENHANCEMENTS
+  * minor UI fixes (#14926)
+  * Move Workaround for #12675 into it's own function (#14922)
+  * Make internal SSH server host key path configurable (#14918)
+  * Hide resync all ssh principals when using internal ssh server (#14904)
+  * Add SameSite setting for cookies (#14900)
+  * Move Bleve and Elastic code indexers to use a common cat-file --batch (#14781)
+  * Add environment-to-ini to docker image (#14762)
+  * add preview support for wiki editor when disable simpleMDE (#14757)
+  * Add easyMDE(simpleMDE) support for release content editor (#14744)
+  * Organization removal confirmation using name not password (#14738)
+  * Make branch names in PR description clickable (#14716)
+  * Add fullTextSearch to dropdowns by default (#14694)
+  * Fix truncated organization names (#14655)
+  * Whitespace in commits (#14650)
+  * Sort / move project boards (#14634)
+  * Make fileheader sticky in diffs (#14616)
+  * Add helper descriptions on new repo page (#14591)
+  * Move the stopwatches to the eventsource stream (#14588)
+  * Add Content-Length header to HEAD requests (#14542)
+  * Add Image Diff options in Diff view (#14450)
+  * Improve Description in new/ edit Project template (#14429)
+  * Allow ssh-keygen on Windows to detect ssh key type (#14413)
+  * Display error if twofaSecret cannot be retrieved (#14372)
+  * Sort issue search results by revelance (#14353)
+  * Implement ghost comment mitigation (#14349)
+  * Upgrade blevesearch dependency to v2.0.1 (#14346)
+  * Add edit, delete and reaction support to code review comments on issue page (#14339)
+  * Merge default and system webhooks under one menu (#14244)
+  * Add option for administrator to reset user 2FA (#14243)
+  * Add option to change username to the admin panel (#14229)
+  * Check for 'main' as potential default branch name (#14193)
+  * Project: show referenced PRs in issue cards (#14183)
+  * Use caddy's certmagic library for extensible/robust ACME handling (#14177)
+  * CLI support for OAuth sources custom icons (#14166)
+  * Custom icons for OAuth sources (#14161)
+  * Team dashboards (#14159)
+  * KanBan: be able to set default board (#14147)
+  * Disable Fomantic's custom scrollbars (#14109)
+  * Add UI to delete tracked times (#14100)
+  * rework heatmap permissions (#14080)
+  * Issue and pull request filters on organization dashboard (#14072)
+  * Fix webhook list styling (#14001)
+  * Show dropdown with all statuses for commit (#13977)
+  * Show status check for merged PRs (#13975)
+  * Diff stat improvements (#13954)
+  * Report permissions denied in internal SSH (#13953)
+  * Markdown task list improvements (#13952)
+  * Heatmap days clickable (#13935)
+  * chore: use octicon-mirror for feeds display (#13928)
+  * Move diff split code into own template file (#13919)
+  * Markdown: Enable wrapping in code blocks and a color tweak (#13894)
+  * Do not reload page after adding comments in Pull Request reviews (#13877)
+  * Add pull request manually merge instruction (#13840)
+  * add thumbnail preview section to issue attachments (#13826)
+  * Move Repo APIFormat to convert package (#13787)
+  * Move notification APIFormat (#13783)
+  * Swap swagger-ui with swagger-ui-dist (#13777)
+  * User Settings: Ignore empty language codes & validate (#13755)
+  * Improve migrate page and add card CSS (#13751)
+  * [Vendor] Update go-redis to v8.5.0 (#13749)
+  * Add block on official review requests branch protection (#13705)
+  * Add review requested filter on pull request overview (#13701)
+  * Use chronological commit order in default squash message (#13696)
+  * Clickable links in pull request (and issue) titles (#13695)
+  * Support shortened commit SHAs in URLs (#13686)
+  * Use native git variants by default with go-git variants as build tag (#13673)
+  * Don't render dropdown when only 1 merge style is available (#13670)
+  * Move webhook type from int to string (#13664)
+  * Direct avatar rendering (#13649)
+  * Verify password for local-account activation (#13631)
+  * Prevent clone protocol button flash on page load (#13626)
+  * Remove fetch request from heatmap (#13623)
+  * Refactor combine label comments with tests (#13619)
+  * Move metrics from macaron to chi (#13601)
+  * Issue and Pulls lists rework (#13594)
+  * HTTP cache rework and enable caching for storage assets (#13569)
+  * Use mount but not register for chi routes (#13555)
+  * Use monaco for the git hook editor (#13552)
+  * Make heatmap colors more distinct (#13533)
+  * Lazy-load issue reviewers and assignees avatars (#13526)
+  * Change search and filter icons to SVG (#13473)
+  * Create tag on ui (#13467)
+  * updateSize when create a repo with init commit (#13441)
+  * Added title and action buttons to Project view page (#13437)
+  * Override fomantic monospace fonts and set size (#13435)
+  * Rework focused comment styling (#13434)
+  * Tags cleanup (#13428)
+  * Various style tweaks (#13418)
+  * Refactor push update (#13381)
+  * Comment box tweaks and SVG dropdown triangles (#13376)
+  * Various style fixes (#13372)
+  * Change repo home page icons to SVG (#13364)
+  * Use CSS Vars for primary color (#13361)
+  * Refactor image paste code (#13354)
+  * Switch from SimpleMDE to EasyMDE (#13333)
+  * Group Label Changed Comments in timeline (#13304)
+  * Make the logger an interface (#13294)
+  * Fix PR/Issue titles on mobile (#13292)
+  * Rearrange the order of the merged by etc. in locale (#13284)
+  * Replace footer and modal icons with SVG (#13245)
+  * Issues overview should not show issues from archived repos (#13220)
+  * Show stale label for stale code comment which is marked as resolved (#13213)
+  * Use CSS Variables for fonts, remove postcss-loader (#13204)
+  * Add mentionable teams to tributeValues and change team mention rules to gh's style (#13198)
+  * Move install pages out of main macaron routes (#13195)
+  * Update outdated label to use Fomantic UI style (#13181)
+  * Added option to disable webhooks (#13176)
+  * Change order of possible-owner organizations to alphabetical (#13160)
+  * Log IP on SSH authentication failure for Built-in SSH server (#13150)
+  * Added option to disable migrations (#13114)
+  * #13091 - add new mirror button (#13105)
+  * Manually approve new registration (#13083)
+  * Cron job to cleanup hook_task table (#13080)
+  * Use the headline comment of pull-request as the squash commit's message (#13071)
+  * Clarify the suffices and prefixes of setting.AppSubURL and setting.AppURL (#12999)
+  * Slightly simplify the queue settings code to help reduce the risk of problems (#12976)
+  * [Feature] add precise search type for Elastic Search (#12869)
+  * [Refactor] Move APIFormat functions into convert package (#12856)
+  * Multiple GitGraph improvements: Exclude PR heads, Add branch/PR links, Show only certain branches, (#12766)
+  * Add TrN for repository limit (#12492)
+  * Refactor doctor (#12264)
+  * Add the tag list page to the release page (#12096)
+  * Redirect on changed user and org name (#11649)
+  * load U2F js only on pages which need it (#11585)
+  * [RFC] Make archival asynchronous (#11296)
+  * Introduce go chi web framework as frontend of macaron, so that we can move routes from macaron to chi step by step (#7420)
+  * Improve vfsgen to not unzip bindata files but send to browser directly (#7109)
+  * Enhance release list (#6025)
+* TRANSLATION
+  * Locale: say another issue instead of this issue (#14082)
+* BUILD
+  * CI: Update license & gitignore by cron (#14419)
+  * Add compliance check for windows to ensure cross platform build (#14260)
+  * deprecate building for mips (#14174)
+  * Precompile fomantic-ui files (#13332)
+* DOCS
+  * docs: swagger show models by default (#14880)
+  * Add missing repo.projects unit into swagger (#14876)
+  * Update docs and comments to remove macaron (#14491)
+  * Issue template addition: Are you using Gitea behind CloudFlare? (#14098)
+  * docs(docker): fix diff format. (#14035)
+  * [Docs] Generate man pages (#13901)
+  * Reformat/fine-tune docs (#13897)
+  * Added Table of Contents to long documentation pages (#13890)
+  * Add docs command (#13429)
+  * Update external-renderers.en-us.md (#13165)
+* MISC
+  * Migrate to use jsoniter instead of encoding/json (#14841)
+  * Add Password Algorithm option to install page (#14701)
+  * Use cat-file --batch in GetLanguageStats (#14685)
+  * Reduce calls to git cat-file -s (#14682)
+  * Update JS dependencies and webpack (#14118)
+  * Cause NotifyMigrateRepository to emit a repo create webhook (#14004)
+  * Reduce make verbosity (#13803)
+  * Add git command error directory on log (#13194)
+  * docker: rootless image (#10154)
+
 ## [1.13.4](https://github.com/go-gitea/gitea/releases/tag/v1.13.4) - 2021-03-07
 
 * SECURITY

From 925e43f6ea04774e55867964b82ef08aec1cf2f7 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Tue, 9 Mar 2021 17:17:53 +0100
Subject: [PATCH 02/21] api

---
 CHANGELOG.md | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 78b12e638b58e..c2943a905f604 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,28 +34,27 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
   * Make manual merge autodetection optional and add manual merge as merge method (#12543)
   * Dump github/gitlab/gitea repository data to a local directory and restore to gitea (#12244)
 * API
-  * [API] get pull, return head branch sha, even if deleted (#14931)
-  * [API] Export LFS & TimeTracking function status (#14753)
+  * Get pull, return head branch sha, even if deleted (#14931)
+  * Export LFS & TimeTracking function status (#14753)
   * Show Gitea version in swagger (#14654)
   * Fix PATCH /repos/{owner}/{repo} panic (#14637)
-  * [API] Add Restricted Field to User (#14630)
+  * Add Restricted Field to User (#14630)
   * Add support for ref parameter to get raw file API (#14602)
-  * [API] Add affected files of commits to commit struct (#14579)
-  * [API] Add  delete release by tag & fix unreleased inconsistency (#14563)
-  * [API] Add pagination to ListBranches (#14524)
+  * Add affected files of commits to commit struct (#14579)
+  * Add  delete release by tag & delete tag (#14563) & (#13358)
+  * Add pagination to ListBranches (#14524)
   * enhancement: add signoff option in commit form (#14516)
-  * [API] GetRelease by tag only return release (#14397)
+  * GetRelease by tag only return release (#14397)
   * Add MirrorInterval to the API (#14163)
-  * API: Make BasicAuth Prefix case insensitive (#14106)
+  * Make BasicAuth Prefix case insensitive (#14106)
   * Add user filter to issueTrackedTimes, enable usage for issue managers (#14081)
-  * [API] Add ref to create/edit issue options & deprecated assignee (#13992)
-  * [API] Add Ref to Issue (#13946)
+  * Add ref to create/edit issue options & deprecated assignee (#13992)
+  * Add Ref to Issue (#13946)
   * Expose default theme in meta and API (#13809)
   * Send error message when CSRF token is missing (#13676)
-  * [API] List, Check, Add & delete endpoints for repository teams (#13630)
-  * API: Admin EditUser: Make FullName, Email, Website & Location optional (#13562)
-  * [API] Add more filters to issues search (#13514)
-  * Delete tag API (#13358)
+  * List, Check, Add & delete endpoints for repository teams (#13630)
+  * Admin EditUser: Make FullName, Email, Website & Location optional (#13562)
+  * Add more filters to issues search (#13514)
   * Add review request api (#11355)
 * BUGFIXES
   * Fix alignment of People and Teams right arrow on org homepage (#14924)

From d1fbb4ef080803f79614eebd204e85e142ddcf0d Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Tue, 9 Mar 2021 17:23:47 +0100
Subject: [PATCH 03/21] Apply suggestions from code review

---
 CHANGELOG.md | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c2943a905f604..d5f0e03ba7996 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,7 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
   * Consolidate Logos and update README header (#14136)
   * Inline manifest.json (#14038)
   * Store repository data in data path if not previously set (#13991)
-  * gitea png to logo (#13974)
+  * Rename "gitea" png to "logo" (#13974)
   * Standardise logging of failed authentication attempts in internal SSH (#13962)
   * Add markdown support in organization description (#13549)
   * Improve users management through the CLI (#6001) (#10492)
@@ -27,7 +27,7 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
   * Display SVG files as images instead of text (#14101)
   * Disable SSH key deletion of externally managed Keys (#13985)
   * Add support for ed25519_sk and ecdsa_sk SSH keys (#13462)
-  * #12897 - add mastodon provider (#13293)
+  * Add Mastodon as OAuth2 Provider (#13293)
   * Sendmail command (#13079)
   * Create DB session provider(based on xorm) (#13031)
   * Add dismiss review feature (#12674)
@@ -66,8 +66,8 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
   * Make searching issues by keyword case insensitive on DB (#14848)
   * Fix misleading sentence (#14829)
   * Prevent use of double sub-path and incorrect asset path in manifest (#14827)
-  * fix link account ui (#14763)
-  * fix preview status switch button on wiki editor (#14742)
+  * Fix link account ui (#14763)
+  * Fix preview status switch button on wiki editor (#14742)
   * Fix github download on migration (#14703)
   * Fix svg spacing (#14638)
   * Prevent adding nil label to .AddedLabels or .RemovedLabels (#14623)
@@ -81,8 +81,8 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
   * Fix incorrect key name so registerManualConfirm works (#14455)
   * Fix close/reopen with comment (#14436)
   * Allow passcode invalid error to appear (#14371)
-  * escape branch names in compare url (#14364)
-  * label and milestone webhooks on issue/pull creation (#14363)
+  * Escape branch names in compare url (#14364)
+  * Label and milestone webhooks on issue/pull creation (#14363)
   * Handle NotifyCreateRef as create branch in feeds (#14245)
   * Prevent clipping input text in Chrome + Segoe UI Font (#14179)
   * Fix UI on edit auth source page (#14137)
@@ -90,7 +90,7 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
   * Refactor get tag to remove unnecessary steps (#14058)
   * Fix integrations test error with space in CURDIR path (#14056)
   * Dropdown triangle fixes (#14028)
-  * fix label of --id in admin delete user (#14005)
+  * Fix label of --id in admin delete user (#14005)
   * Update HEAD to match defaultBranch in template generation (#13948)
   * Fix action avatar loading (#13909)
   * Fix issue participants (#13893)
@@ -105,19 +105,19 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
   * Fix bug on release publisherid migrations (#13410)
   * Fix --port setting (#13288)
   * Keep database transactions not too big (#13254)
-  * go-version constraints ignore pre-releases (#13234)
+  * Git version check, ignore pre-releases constraints (#13234)
   * Handle and propagate errors when checking if paths are Dirs, Files or Exist (#13186)
   * Update Mirror IsEmpty status on synchronize (#13185)
   * Use GO variable in go-check target (#13146) (#13147)
 * ENHANCEMENTS
-  * minor UI fixes (#14926)
+  * Minor UI fixes (#14926)
   * Move Workaround for #12675 into it's own function (#14922)
   * Make internal SSH server host key path configurable (#14918)
   * Hide resync all ssh principals when using internal ssh server (#14904)
   * Add SameSite setting for cookies (#14900)
   * Move Bleve and Elastic code indexers to use a common cat-file --batch (#14781)
   * Add environment-to-ini to docker image (#14762)
-  * add preview support for wiki editor when disable simpleMDE (#14757)
+  * Add preview support for wiki editor when disable simpleMDE (#14757)
   * Add easyMDE(simpleMDE) support for release content editor (#14744)
   * Organization removal confirmation using name not password (#14738)
   * Make branch names in PR description clickable (#14716)
@@ -149,7 +149,7 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
   * KanBan: be able to set default board (#14147)
   * Disable Fomantic's custom scrollbars (#14109)
   * Add UI to delete tracked times (#14100)
-  * rework heatmap permissions (#14080)
+  * Rework heatmap permissions (#14080)
   * Issue and pull request filters on organization dashboard (#14072)
   * Fix webhook list styling (#14001)
   * Show dropdown with all statuses for commit (#13977)
@@ -169,7 +169,6 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
   * Swap swagger-ui with swagger-ui-dist (#13777)
   * User Settings: Ignore empty language codes & validate (#13755)
   * Improve migrate page and add card CSS (#13751)
-  * [Vendor] Update go-redis to v8.5.0 (#13749)
   * Add block on official review requests branch protection (#13705)
   * Add review requested filter on pull request overview (#13701)
   * Use chronological commit order in default squash message (#13696)
@@ -234,7 +233,7 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
   * Add the tag list page to the release page (#12096)
   * Redirect on changed user and org name (#11649)
   * load U2F js only on pages which need it (#11585)
-  * [RFC] Make archival asynchronous (#11296)
+  * Make archival asynchronous (#11296)
   * Introduce go chi web framework as frontend of macaron, so that we can move routes from macaron to chi step by step (#7420)
   * Improve vfsgen to not unzip bindata files but send to browser directly (#7109)
   * Enhance release list (#6025)
@@ -246,12 +245,12 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
   * deprecate building for mips (#14174)
   * Precompile fomantic-ui files (#13332)
 * DOCS
-  * docs: swagger show models by default (#14880)
+  * Swagger show models by default (#14880)
   * Add missing repo.projects unit into swagger (#14876)
   * Update docs and comments to remove macaron (#14491)
   * Issue template addition: Are you using Gitea behind CloudFlare? (#14098)
-  * docs(docker): fix diff format. (#14035)
-  * [Docs] Generate man pages (#13901)
+  * Docker: fix diff format. (#14035)
+  * Generate man pages (#13901)
   * Reformat/fine-tune docs (#13897)
   * Added Table of Contents to long documentation pages (#13890)
   * Add docs command (#13429)

From d081be9339ed58a9c7a29128ebe3da7772156f0a Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Tue, 9 Mar 2021 17:26:15 +0100
Subject: [PATCH 04/21] Apply suggestions from code review

Co-authored-by: zeripath <art27@cantab.net>
---
 CHANGELOG.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d5f0e03ba7996..aac130f7066bb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,8 +7,8 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
 ## [1.14.0-RC1](https://github.com/go-gitea/gitea/releases/tag/v1.14.0) - 2021-03-09
 
 * BREAKING
-  * Fix access log (#14475)
-  * Move macaron to chi (#14293)
+  * Restore Access.log following migration to Chi framework (Stops access logging of /api/internal routes) (#14475)
+  * Migrate from Macaron to Chi framework (#14293)
   * Consolidate Logos and update README header (#14136)
   * Inline manifest.json (#14038)
   * Store repository data in data path if not previously set (#13991)
@@ -27,8 +27,8 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
   * Display SVG files as images instead of text (#14101)
   * Disable SSH key deletion of externally managed Keys (#13985)
   * Add support for ed25519_sk and ecdsa_sk SSH keys (#13462)
-  * Add Mastodon as OAuth2 Provider (#13293)
-  * Sendmail command (#13079)
+  * Add support for Mastodon OAuth2 provider (#13293)
+  * Add gitea sendmail command (#13079)
   * Create DB session provider(based on xorm) (#13031)
   * Add dismiss review feature (#12674)
   * Make manual merge autodetection optional and add manual merge as merge method (#12543)
@@ -43,7 +43,7 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
   * Add affected files of commits to commit struct (#14579)
   * Add  delete release by tag & delete tag (#14563) & (#13358)
   * Add pagination to ListBranches (#14524)
-  * enhancement: add signoff option in commit form (#14516)
+  * Add signoff option in commit form (#14516)
   * GetRelease by tag only return release (#14397)
   * Add MirrorInterval to the API (#14163)
   * Make BasicAuth Prefix case insensitive (#14106)

From 783f38ce3630bf038ea0875d3fe962088f1608da Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Wed, 10 Mar 2021 12:52:45 +0100
Subject: [PATCH 05/21] Apply suggestions from code review

Co-authored-by: zeripath <art27@cantab.net>
---
 CHANGELOG.md | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aac130f7066bb..d38008d584348 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -219,14 +219,14 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
   * Change order of possible-owner organizations to alphabetical (#13160)
   * Log IP on SSH authentication failure for Built-in SSH server (#13150)
   * Added option to disable migrations (#13114)
-  * #13091 - add new mirror button (#13105)
+  * New "Add Mirror" Button in the Organization view (#13105)
   * Manually approve new registration (#13083)
   * Cron job to cleanup hook_task table (#13080)
   * Use the headline comment of pull-request as the squash commit's message (#13071)
   * Clarify the suffices and prefixes of setting.AppSubURL and setting.AppURL (#12999)
   * Slightly simplify the queue settings code to help reduce the risk of problems (#12976)
-  * [Feature] add precise search type for Elastic Search (#12869)
-  * [Refactor] Move APIFormat functions into convert package (#12856)
+  * Add precise search type for Elastic Search (#12869)
+  * Move APIFormat functions into convert package (#12856)
   * Multiple GitGraph improvements: Exclude PR heads, Add branch/PR links, Show only certain branches, (#12766)
   * Add TrN for repository limit (#12492)
   * Refactor doctor (#12264)
@@ -237,12 +237,10 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
   * Introduce go chi web framework as frontend of macaron, so that we can move routes from macaron to chi step by step (#7420)
   * Improve vfsgen to not unzip bindata files but send to browser directly (#7109)
   * Enhance release list (#6025)
-* TRANSLATION
-  * Locale: say another issue instead of this issue (#14082)
 * BUILD
   * CI: Update license & gitignore by cron (#14419)
   * Add compliance check for windows to ensure cross platform build (#14260)
-  * deprecate building for mips (#14174)
+  * Deprecate building for mips (#14174)
   * Precompile fomantic-ui files (#13332)
 * DOCS
   * Swagger show models by default (#14880)
@@ -260,11 +258,10 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
   * Add Password Algorithm option to install page (#14701)
   * Use cat-file --batch in GetLanguageStats (#14685)
   * Reduce calls to git cat-file -s (#14682)
-  * Update JS dependencies and webpack (#14118)
   * Cause NotifyMigrateRepository to emit a repo create webhook (#14004)
   * Reduce make verbosity (#13803)
   * Add git command error directory on log (#13194)
-  * docker: rootless image (#10154)
+  * Create Rootless Docker image (#10154)
 
 ## [1.13.4](https://github.com/go-gitea/gitea/releases/tag/v1.13.4) - 2021-03-07
 

From 8a1479f53ddbba38a0601263c48bb0059be18685 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Thu, 11 Mar 2021 02:17:50 +0100
Subject: [PATCH 06/21] update

---
 CHANGELOG.md | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d38008d584348..a89608f427a4a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -91,6 +91,7 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
   * Fix integrations test error with space in CURDIR path (#14056)
   * Dropdown triangle fixes (#14028)
   * Fix label of --id in admin delete user (#14005)
+  * Cause NotifyMigrateRepository to emit a repo create webhook (#14004)
   * Update HEAD to match defaultBranch in template generation (#13948)
   * Fix action avatar loading (#13909)
   * Fix issue participants (#13893)
@@ -110,8 +111,7 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
   * Update Mirror IsEmpty status on synchronize (#13185)
   * Use GO variable in go-check target (#13146) (#13147)
 * ENHANCEMENTS
-  * Minor UI fixes (#14926)
-  * Move Workaround for #12675 into it's own function (#14922)
+  * UI style improvements
   * Make internal SSH server host key path configurable (#14918)
   * Hide resync all ssh principals when using internal ssh server (#14904)
   * Add SameSite setting for cookies (#14900)
@@ -121,6 +121,7 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
   * Add easyMDE(simpleMDE) support for release content editor (#14744)
   * Organization removal confirmation using name not password (#14738)
   * Make branch names in PR description clickable (#14716)
+  * Add Password Algorithm option to install page (#14701)
   * Add fullTextSearch to dropdowns by default (#14694)
   * Fix truncated organization names (#14655)
   * Whitespace in commits (#14650)
@@ -238,8 +239,6 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
   * Improve vfsgen to not unzip bindata files but send to browser directly (#7109)
   * Enhance release list (#6025)
 * BUILD
-  * CI: Update license & gitignore by cron (#14419)
-  * Add compliance check for windows to ensure cross platform build (#14260)
   * Deprecate building for mips (#14174)
   * Precompile fomantic-ui files (#13332)
 * DOCS
@@ -255,10 +254,6 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
   * Update external-renderers.en-us.md (#13165)
 * MISC
   * Migrate to use jsoniter instead of encoding/json (#14841)
-  * Add Password Algorithm option to install page (#14701)
-  * Use cat-file --batch in GetLanguageStats (#14685)
-  * Reduce calls to git cat-file -s (#14682)
-  * Cause NotifyMigrateRepository to emit a repo create webhook (#14004)
   * Reduce make verbosity (#13803)
   * Add git command error directory on log (#13194)
   * Create Rootless Docker image (#10154)
@@ -466,7 +461,7 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
   * Fix scrolling to resolved comment anchors (#13343) (#13371)
   * Storage configuration support `[storage]` (#13314) (#13379)
   * When creating line diffs do not split within an html entity (#13357) (#13375) (#13425) (#13427)
-  * Fix reactions on code comments (#13390) (#13401) 
+  * Fix reactions on code comments (#13390) (#13401)
   * Add missing full names when DEFAULT_SHOW_FULL_NAME is enabled (#13424)
   * Replies to outdated code comments should also be outdated (#13217) (#13433)
   * Fix panic bug in handling multiple references in commit (#13486) (#13487)

From f329454adc06ace3440986cbac578a3caa990655 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Thu, 11 Mar 2021 02:26:44 +0100
Subject: [PATCH 07/21] Apply suggestions from code review

Co-authored-by: techknowlogick <matti@mdranta.net>
---
 CHANGELOG.md | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a89608f427a4a..8a9b85a91e207 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,7 +41,7 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
   * Add Restricted Field to User (#14630)
   * Add support for ref parameter to get raw file API (#14602)
   * Add affected files of commits to commit struct (#14579)
-  * Add  delete release by tag & delete tag (#14563) & (#13358)
+  * Add delete release by tag & delete tag (#14563) & (#13358)
   * Add pagination to ListBranches (#14524)
   * Add signoff option in commit form (#14516)
   * GetRelease by tag only return release (#14397)
@@ -61,10 +61,9 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
   * Fix overdue marking of closed issues and milestones (#14923)
   * Prevent panic when empty MilestoneID in repo/issue/list (#14911)
   * Fix migration context data (#14910)
-  * Handle URLs with trailing / (#14852)
+  * Handle URLs with trailing slash (#14852)
   * Add CORS config on to /login/oauth/access_token endpoint (#14850)
   * Make searching issues by keyword case insensitive on DB (#14848)
-  * Fix misleading sentence (#14829)
   * Prevent use of double sub-path and incorrect asset path in manifest (#14827)
   * Fix link account ui (#14763)
   * Fix preview status switch button on wiki editor (#14742)
@@ -95,7 +94,6 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
   * Update HEAD to match defaultBranch in template generation (#13948)
   * Fix action avatar loading (#13909)
   * Fix issue participants (#13893)
-  * Repo avatar fixes (#13891)
   * Fix avatar template error (#13833)
   * Fix review request notification email links when external issue tracker is enabled (#13723)
   * Fix blame line alignment (#13542)
@@ -240,7 +238,6 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
   * Enhance release list (#6025)
 * BUILD
   * Deprecate building for mips (#14174)
-  * Precompile fomantic-ui files (#13332)
 * DOCS
   * Swagger show models by default (#14880)
   * Add missing repo.projects unit into swagger (#14876)

From b1ba0c57111c85c1bc748a8fed78c2d42f743bf2 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Thu, 11 Mar 2021 02:31:03 +0100
Subject: [PATCH 08/21] Update CHANGELOG.md

Co-authored-by: techknowlogick <matti@mdranta.net>
---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8a9b85a91e207..d04d2d857673c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -243,7 +243,6 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
   * Add missing repo.projects unit into swagger (#14876)
   * Update docs and comments to remove macaron (#14491)
   * Issue template addition: Are you using Gitea behind CloudFlare? (#14098)
-  * Docker: fix diff format. (#14035)
   * Generate man pages (#13901)
   * Reformat/fine-tune docs (#13897)
   * Added Table of Contents to long documentation pages (#13890)

From 117fd0528d27343905cefe29e1d371f5c6549c4f Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Thu, 11 Mar 2021 02:32:36 +0100
Subject: [PATCH 09/21] update

---
 CHANGELOG.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d04d2d857673c..b8f4e31455962 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
 * BREAKING
   * Restore Access.log following migration to Chi framework (Stops access logging of /api/internal routes) (#14475)
   * Migrate from Macaron to Chi framework (#14293)
+  * Deprecate building for mips (#14174)
   * Consolidate Logos and update README header (#14136)
   * Inline manifest.json (#14038)
   * Store repository data in data path if not previously set (#13991)
@@ -33,6 +34,7 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
   * Add dismiss review feature (#12674)
   * Make manual merge autodetection optional and add manual merge as merge method (#12543)
   * Dump github/gitlab/gitea repository data to a local directory and restore to gitea (#12244)
+  * Create Rootless Docker image (#10154)
 * API
   * Get pull, return head branch sha, even if deleted (#14931)
   * Export LFS & TimeTracking function status (#14753)
@@ -236,8 +238,6 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
   * Introduce go chi web framework as frontend of macaron, so that we can move routes from macaron to chi step by step (#7420)
   * Improve vfsgen to not unzip bindata files but send to browser directly (#7109)
   * Enhance release list (#6025)
-* BUILD
-  * Deprecate building for mips (#14174)
 * DOCS
   * Swagger show models by default (#14880)
   * Add missing repo.projects unit into swagger (#14876)
@@ -252,7 +252,6 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
   * Migrate to use jsoniter instead of encoding/json (#14841)
   * Reduce make verbosity (#13803)
   * Add git command error directory on log (#13194)
-  * Create Rootless Docker image (#10154)
 
 ## [1.13.4](https://github.com/go-gitea/gitea/releases/tag/v1.13.4) - 2021-03-07
 

From 2b5253d43134cd2487dea5f6e0f6db3fad1b6778 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Thu, 11 Mar 2021 02:33:54 +0100
Subject: [PATCH 10/21] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b8f4e31455962..a8b2a6afc6e7a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,7 +20,7 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
 * FEATURES
   * Repository transfer has to be confirmed, if user can not create repo for new owner (#14792)
   * Allow blocking some email domains from registering an account (#14667)
-  * Comment - Reference in new issue (#14366)
+  * Create a new issue based on reference to an issue comment (#14366)
   * Add support to migrate from gogs (#14342)
   * Add pager to the branches page (#14202)
   * Minimal OpenID Connect implementation (#14139)

From f433162c761b5ae8efdaf53ad9c8eac744ce602d Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Thu, 11 Mar 2021 19:43:44 +0100
Subject: [PATCH 11/21] Apply suggestions from code review

Co-authored-by: zeripath <art27@cantab.net>
---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a8b2a6afc6e7a..8fe315840fd6e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -75,10 +75,9 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
   * Truncated organizations name (#14615)
   * Exclude the current dump file from the dump (#14606)
   * Use OldRef instead of CommitSHA for DeleteBranch comments (#14604)
-  * Ensure memcache TTL cannot be over 30 days (#14592)
+  * Ensure memcache caching works when TTL greater than 30 days (#14592)
   * Remove NULs byte arrays passed to PostProcess (#14587)
   * Restore detection of branches are equal on compare page (#14586)
-  * Upgrade 'css-minimizer-webpack-plugin' to the latest version (#14527)
   * Fix incorrect key name so registerManualConfirm works (#14455)
   * Fix close/reopen with comment (#14436)
   * Allow passcode invalid error to appear (#14371)
@@ -112,6 +111,7 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
   * Use GO variable in go-check target (#13146) (#13147)
 * ENHANCEMENTS
   * UI style improvements
+  * Add ui.explore settings to control view of explore pages (#14094)
   * Make internal SSH server host key path configurable (#14918)
   * Hide resync all ssh principals when using internal ssh server (#14904)
   * Add SameSite setting for cookies (#14900)

From 04d09adcdf657b2d4854175d40c4b3bf6b1840e0 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Tue, 16 Mar 2021 02:45:12 +0100
Subject: [PATCH 12/21] Apply suggestions from code review

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8fe315840fd6e..85f6a0d2fc343 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
 ## [1.14.0-RC1](https://github.com/go-gitea/gitea/releases/tag/v1.14.0) - 2021-03-09
 
 * BREAKING
+  * Add reverse proxy configuration support for remote IP address (#14959)
   * Restore Access.log following migration to Chi framework (Stops access logging of /api/internal routes) (#14475)
   * Migrate from Macaron to Chi framework (#14293)
   * Deprecate building for mips (#14174)
@@ -59,6 +60,10 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
   * Add more filters to issues search (#13514)
   * Add review request api (#11355)
 * BUGFIXES
+  * Ensure validation occurs on clone addresses too (#14994)
+  * Fix several render issues (#14986)
+  * Show correct issues for team dashboard (#14952)
+  * Ensure that new pull request button works on forked forks owned by owner of the root and reduce ambiguity (#14932)
   * Fix alignment of People and Teams right arrow on org homepage (#14924)
   * Fix overdue marking of closed issues and milestones (#14923)
   * Prevent panic when empty MilestoneID in repo/issue/list (#14911)

From 2b01cc44c60a4bdeddb0a3cf0c0b22238fea53d3 Mon Sep 17 00:00:00 2001
From: Andrew Thornton <art27@cantab.net>
Date: Tue, 16 Mar 2021 18:17:12 +0000
Subject: [PATCH 13/21] Move things to SECURITY that are SECURITY

Signed-off-by: Andrew Thornton <art27@cantab.net>
---
 CHANGELOG.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 85f6a0d2fc343..5f2f9e1db1231 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,8 +6,11 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
 
 ## [1.14.0-RC1](https://github.com/go-gitea/gitea/releases/tag/v1.14.0) - 2021-03-09
 
-* BREAKING
+* SECURITY
   * Add reverse proxy configuration support for remote IP address (#14959)
+  * Ensure validation occurs on clone addresses too (#14994)
+  * Fix several render issues highlighted during fuzzing (#14986)
+* BREAKING
   * Restore Access.log following migration to Chi framework (Stops access logging of /api/internal routes) (#14475)
   * Migrate from Macaron to Chi framework (#14293)
   * Deprecate building for mips (#14174)
@@ -60,8 +63,6 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
   * Add more filters to issues search (#13514)
   * Add review request api (#11355)
 * BUGFIXES
-  * Ensure validation occurs on clone addresses too (#14994)
-  * Fix several render issues (#14986)
   * Show correct issues for team dashboard (#14952)
   * Ensure that new pull request button works on forked forks owned by owner of the root and reduce ambiguity (#14932)
   * Fix alignment of People and Teams right arrow on org homepage (#14924)

From 28c1f597aba372095ea1e804930a32af3fdc8032 Mon Sep 17 00:00:00 2001
From: zeripath <art27@cantab.net>
Date: Wed, 17 Mar 2021 17:40:47 +0000
Subject: [PATCH 14/21] Update CHANGELOG.md

Co-authored-by: Lauris BH <lauris@nix.lv>
---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5f2f9e1db1231..b6ea09663866f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
 ## [1.14.0-RC1](https://github.com/go-gitea/gitea/releases/tag/v1.14.0) - 2021-03-09
 
 * SECURITY
-  * Add reverse proxy configuration support for remote IP address (#14959)
+  * Add reverse proxy configuration support for remote IP address detection (#14959)
   * Ensure validation occurs on clone addresses too (#14994)
   * Fix several render issues highlighted during fuzzing (#14986)
 * BREAKING

From 03f9810f96fb2425b1abe699493f1a50e87bca3f Mon Sep 17 00:00:00 2001
From: zeripath <art27@cantab.net>
Date: Wed, 17 Mar 2021 21:04:43 +0000
Subject: [PATCH 15/21] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b6ea09663866f..6c21235ae7769 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -244,6 +244,7 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
   * Introduce go chi web framework as frontend of macaron, so that we can move routes from macaron to chi step by step (#7420)
   * Improve vfsgen to not unzip bindata files but send to browser directly (#7109)
   * Enhance release list (#6025)
+  * Support git .mailmap in GetCodeActivityStats() (#15009)
 * DOCS
   * Swagger show models by default (#14880)
   * Add missing repo.projects unit into swagger (#14876)

From 758e4076ffd30a3a352fac256f4460d46da755ce Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Thu, 18 Mar 2021 16:45:32 +0100
Subject: [PATCH 16/21] Apply suggestions from code review

Co-authored-by: Norwin <noerw@users.noreply.github.com>
---
 CHANGELOG.md | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c21235ae7769..f791cb81ce02f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
   * Add markdown support in organization description (#13549)
   * Improve users management through the CLI (#6001) (#10492)
 * FEATURES
+  * Create a new issue with reference to lines of code from file view (#14863)
   * Repository transfer has to be confirmed, if user can not create repo for new owner (#14792)
   * Allow blocking some email domains from registering an account (#14667)
   * Create a new issue based on reference to an issue comment (#14366)
@@ -117,6 +118,8 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
   * Use GO variable in go-check target (#13146) (#13147)
 * ENHANCEMENTS
   * UI style improvements
+  * Support .mailmap in code activity stats (#15009)
+  * Sort release attachments by name (#15008)  
   * Add ui.explore settings to control view of explore pages (#14094)
   * Make internal SSH server host key path configurable (#14918)
   * Hide resync all ssh principals when using internal ssh server (#14904)
@@ -244,7 +247,6 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
   * Introduce go chi web framework as frontend of macaron, so that we can move routes from macaron to chi step by step (#7420)
   * Improve vfsgen to not unzip bindata files but send to browser directly (#7109)
   * Enhance release list (#6025)
-  * Support git .mailmap in GetCodeActivityStats() (#15009)
 * DOCS
   * Swagger show models by default (#14880)
   * Add missing repo.projects unit into swagger (#14876)
@@ -256,6 +258,7 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
   * Add docs command (#13429)
   * Update external-renderers.en-us.md (#13165)
 * MISC
+  * Add builds for apple M1 (darwin arm64) (#14951)
   * Migrate to use jsoniter instead of encoding/json (#14841)
   * Reduce make verbosity (#13803)
   * Add git command error directory on log (#13194)

From 4790bd7ed2cd0c152525adb268c450fbc1b2f1a2 Mon Sep 17 00:00:00 2001
From: zeripath <art27@cantab.net>
Date: Thu, 18 Mar 2021 17:37:21 +0000
Subject: [PATCH 17/21] Update CHANGELOG.md

Co-authored-by: Kyle D. <kdumontnu@gmail.com>
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f791cb81ce02f..9ef972384315e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
   * Add reverse proxy configuration support for remote IP address detection (#14959)
   * Ensure validation occurs on clone addresses too (#14994)
   * Fix several render issues highlighted during fuzzing (#14986)
+  * Respect approved email domain list for externally validated user registration (#15014)
 * BREAKING
   * Restore Access.log following migration to Chi framework (Stops access logging of /api/internal routes) (#14475)
   * Migrate from Macaron to Chi framework (#14293)

From 462a58768335ec84adc1cdcc9bef0aad79398fbd Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Thu, 18 Mar 2021 19:09:47 +0100
Subject: [PATCH 18/21] sort

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ef972384315e..1a1c94e07c71c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,10 +7,10 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
 ## [1.14.0-RC1](https://github.com/go-gitea/gitea/releases/tag/v1.14.0) - 2021-03-09
 
 * SECURITY
+  * Respect approved email domain list for externally validated user registration (#15014)
   * Add reverse proxy configuration support for remote IP address detection (#14959)
   * Ensure validation occurs on clone addresses too (#14994)
   * Fix several render issues highlighted during fuzzing (#14986)
-  * Respect approved email domain list for externally validated user registration (#15014)
 * BREAKING
   * Restore Access.log following migration to Chi framework (Stops access logging of /api/internal routes) (#14475)
   * Migrate from Macaron to Chi framework (#14293)

From 02ff1735fe4bbcac487fdbda09f5e3c6a95e91f4 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Thu, 18 Mar 2021 22:58:19 +0100
Subject: [PATCH 19/21] Update CHANGELOG.md

Co-authored-by: Kyle D. <kdumontnu@gmail.com>
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a1c94e07c71c..a7afe41b41790 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -67,6 +67,7 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
 * BUGFIXES
   * Show correct issues for team dashboard (#14952)
   * Ensure that new pull request button works on forked forks owned by owner of the root and reduce ambiguity (#14932)
+  * Only allow issue labels from owner repository or organization (#14928)
   * Fix alignment of People and Teams right arrow on org homepage (#14924)
   * Fix overdue marking of closed issues and milestones (#14923)
   * Prevent panic when empty MilestoneID in repo/issue/list (#14911)

From b7b6fe6f0fb0fcc23e3df3f2bfdfff2e6143b997 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Fri, 19 Mar 2021 00:48:28 +0100
Subject: [PATCH 20/21] :gitea: :rocket:

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a7afe41b41790..8fbef05a14eb1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -49,6 +49,7 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
   * Add Restricted Field to User (#14630)
   * Add support for ref parameter to get raw file API (#14602)
   * Add affected files of commits to commit struct (#14579)
+  * Fix CJK fonts again and misc. font issues (#14575)
   * Add delete release by tag & delete tag (#14563) & (#13358)
   * Add pagination to ListBranches (#14524)
   * Add signoff option in commit form (#14516)
@@ -65,6 +66,7 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
   * Add more filters to issues search (#13514)
   * Add review request api (#11355)
 * BUGFIXES
+  * Move setting to enable closing issue via commit in non default branch to repo settings (#14965)
   * Show correct issues for team dashboard (#14952)
   * Ensure that new pull request button works on forked forks owned by owner of the root and reduce ambiguity (#14932)
   * Only allow issue labels from owner repository or organization (#14928)

From 0e9ff7bf5ce4ca208757ac64caf4f52974048404 Mon Sep 17 00:00:00 2001
From: Lauris BH <lauris@nix.lv>
Date: Fri, 19 Mar 2021 21:37:29 +0200
Subject: [PATCH 21/21] Update date

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8fbef05a14eb1..ae0e6b4fe959b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@ This changelog goes through all the changes that have been made in each release
 without substantial changes to our git log; to see the highlights of what has
 been added to each release, please refer to the [blog](https://blog.gitea.io).
 
-## [1.14.0-RC1](https://github.com/go-gitea/gitea/releases/tag/v1.14.0) - 2021-03-09
+## [1.14.0-RC1](https://github.com/go-gitea/gitea/releases/tag/v1.14.0) - 2021-03-19
 
 * SECURITY
   * Respect approved email domain list for externally validated user registration (#15014)