summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-08-02 23:23:21 +0000
committerDouwe Maan <douwe@gitlab.com>2016-08-02 23:23:21 +0000
commit6c519b7a7420901a5ec608e9a73786d32bd23407 (patch)
treec9cf9923e88caa728cf81cf38a7d129c78bd13fb /docker
parentb69cc5239d87f5ad14870031147f06ca0ac4f938 (diff)
parentb371d751287fd8a01126c7aa5f156f868d177ef2 (diff)
downloadgitlab-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 'docker')
0 files changed, 0 insertions, 0 deletions