summaryrefslogtreecommitdiff
path: root/doc/development/changelog.md
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2018-10-02 15:17:48 -0500
committerMike Greiling <mike@pixelcog.com>2018-10-02 15:17:48 -0500
commitc0dffdff401ce6d78b9373bdbbc50ee242a2bf24 (patch)
tree093706a91560cca635a9e9feff4c04d301e760cc /doc/development/changelog.md
parenta9df7d866dc726ded2cb0a295a4af68a010201e2 (diff)
parent9ab5910065c22b6e26fd7906d32bf457f3abb07d (diff)
downloadgitlab-ce-c0dffdff401ce6d78b9373bdbbc50ee242a2bf24.tar.gz
Merge branch 'master' into 43511-upgrade-to-babel-7
* master: (30 commits) Refactor quick actions docs into multiple tables CE Resolve "Refactor code quality similar to JUnit tests" Fix rename_login_root_namespaces post migration Merge branch 'master-i18n' into 'master' Hides Close MR button on merged MR Show the commit-sha for pre-release versions Resolve "Add "Link" shortcut/icon in markdown editor to make it easier to add references" Use tiller locally for Auto Devops Improve logging when username update fails due to registry tags [QA] Improve admin hashed-storage settings circumvent browser cache on browser back navigation Highlight current user in comments and system notes Resolve "Selecting an autofill suggestion for project name will not update the project slug" Update Workhorse to 7.0.0 for Gitaly's new auth scheme Update to Rouge 3.3.0 including frozen string literals for improved memory usage Don't check for the groups list before filtering Add missing changelog type [ci skip] Filter issues without an Assignee via the API Make single diff patch limit configurable Add yarn integrity hashes ...
Diffstat (limited to 'doc/development/changelog.md')
-rw-r--r--doc/development/changelog.md3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/development/changelog.md b/doc/development/changelog.md
index 9e0c81b3d60..f06d40d1dbb 100644
--- a/doc/development/changelog.md
+++ b/doc/development/changelog.md
@@ -110,7 +110,8 @@ At this point the script would ask you to select the category of the change (map
4. New deprecation
5. Feature removal
6. Security fix
-7. Other
+7. Performance improvement
+8. Other
```
The entry filename is based on the name of the current Git branch. If you run