Douwe Maan 6c519b7a74 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		2016-08-02 23:23:21 +00:00
..
ci
concerns
hooks
members
project_services
ability_spec.rb
abuse_report_spec.rb
appearance_spec.rb
application_setting_spec.rb
award_emoji_spec.rb
blob_spec.rb
broadcast_message_spec.rb
build_spec.rb
commit_range_spec.rb
commit_spec.rb
commit_status_spec.rb
deploy_key_spec.rb
deploy_keys_project_spec.rb
deployment_spec.rb
diff_note_spec.rb
email_spec.rb
environment_spec.rb
event_spec.rb
external_issue_spec.rb
forked_project_link_spec.rb
generic_commit_status_spec.rb
global_milestone_spec.rb
group_spec.rb
identity_spec.rb
issue_spec.rb
key_spec.rb
label_link_spec.rb
label_spec.rb
legacy_diff_note_spec.rb
member_spec.rb
merge_request_diff_spec.rb
merge_request_spec.rb
milestone_spec.rb
namespace_spec.rb
note_spec.rb
notification_setting_spec.rb
personal_access_token_spec.rb
project_group_link_spec.rb
project_security_spec.rb
project_snippet_spec.rb
project_spec.rb
project_team_spec.rb
project_wiki_spec.rb
protected_branch_spec.rb
release_spec.rb
repository_spec.rb
service_spec.rb
snippet_spec.rb
spam_log_spec.rb
todo_spec.rb
tree_spec.rb
user_spec.rb
wiki_page_spec.rb