kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity
gitlab-org--gitlab-foss/spec
History
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
..
config
controllers Remove url_for_new_issue helper 2016-08-01 18:23:12 -07:00
factories Merge branch 'zj-env-external-url' into 'master' 2016-08-01 09:04:09 +00:00
features Fix search results for notes without commits 2016-08-01 11:53:12 -03:00
finders Add failing test for #20462 2016-08-02 03:32:28 +02:00
fixtures Merge remote-tracking branch 'upstream/master' into new-issue-by-email 2016-07-26 14:51:52 +08:00
helpers Remove url_for_new_issue helper 2016-08-01 18:23:12 -07:00
initializers Ignore invalid IPs in X-Forwarded-For when trusted proxies are configured. 2016-07-31 15:36:11 -04:00
javascripts ES6ify all the things! 2016-07-24 23:45:11 +03:00
lib Add failing tests for #19028 2016-08-02 03:44:07 +02:00
mailers Make Notify specs more robust by setting up assignee names 2016-07-22 13:54:12 +02:00
models Merge branch '18866-add-simple-identifier-to-public-ssh-keys' into 'master' 2016-08-02 23:23:21 +00:00
requests Minor fixes in the Env API endpoints 2016-08-01 08:42:09 +02:00
routing Add failing test for #20462 2016-08-02 03:32:28 +02:00
services webhooks: include old revision in MR update events 2016-08-01 11:20:07 -04:00
support Add failing test for #20462 2016-08-02 03:32:28 +02:00
tasks/gitlab Enable Style/EmptyLines cop, remove redundant ones 2016-07-01 21:56:17 +02:00
uploaders Remove VideoJS and clean the integration 2016-07-20 11:36:42 +02:00
views Add failing test for #20462 2016-08-02 03:32:28 +02:00
workers Merge remote-tracking branch 'upstream/master' into new-issue-by-email 2016-07-27 18:11:50 +08:00
factories_spec.rb
rails_helper.rb
simplecov_env.rb Introduce SimpleCovEnv singleton helper and use it 2016-07-21 12:46:49 +02:00
spec_helper.rb Introduce SimpleCovEnv singleton helper and use it 2016-07-21 12:46:49 +02:00
teaspoon_env.rb Removed coffee matchers 2016-07-29 00:19:50 +01:00