diff options
author | Douwe Maan <douwe@gitlab.com> | 2016-08-02 23:23:21 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2016-08-02 23:23:21 +0000 |
commit | 6c519b7a7420901a5ec608e9a73786d32bd23407 (patch) | |
tree | c9cf9923e88caa728cf81cf38a7d129c78bd13fb /CHANGELOG | |
parent | b69cc5239d87f5ad14870031147f06ca0ac4f938 (diff) | |
parent | b371d751287fd8a01126c7aa5f156f868d177ef2 (diff) | |
download | gitlab-ce-6c519b7a7420901a5ec608e9a73786d32bd23407.tar.gz |
Merge branch '18866-add-simple-identifier-to-public-ssh-keys' into 'master'
Add simple identifier to public SSH keys
## What does this MR do?
Adds a simple identifier of user_name + hostname to public SSH keys
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
To help people identify keys when they export them
## What are the relevant issue numbers?
#18866
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ -] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ -] API support added
- Tests
- [ x] Added for this feature/bug
- [ x] All builds are passing
- [ x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
Closes #18866
See merge request !5614
Diffstat (limited to 'CHANGELOG')
-rw-r--r-- | CHANGELOG | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 31e5d982cdf..55a382b9cd7 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -23,6 +23,7 @@ v 8.11.0 (unreleased) - Fix renaming repository when name contains invalid chararacters under project settings - Optimize checking if a user has read access to a list of issues !5370 - Nokogiri's various parsing methods are now instrumented + - Add simple identifier to public SSH keys (muteor) - Add a way to send an email and create an issue based on private personal token. Find the email address from issues page. !3363 - Include old revision in merge request update hooks (Ben Boeckel) - Add build event color in HipChat messages (David Eisner) |