diff options
| author | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-06-19 19:17:34 +0200 |
|---|---|---|
| committer | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-08-04 14:33:18 +0200 |
| commit | 4ccd767abf45df909c43e93d8898096236c99e3d (patch) | |
| tree | 3cf46a9dd0d7db5c7a2abb9759a9b39e3fe90277 /app/models | |
| parent | 58c76605b31f56c8a2dff9381feae859bedb2076 (diff) | |
| download | gitlab-ce-4ccd767abf45df909c43e93d8898096236c99e3d.tar.gz | |
Only publish ssh key-type and key
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/key.rb | 5 | ||||
| -rw-r--r-- | app/models/user.rb | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/models/key.rb b/app/models/key.rb index 2dcae059c0e..406a1257b5d 100644 --- a/app/models/key.rb +++ b/app/models/key.rb @@ -39,6 +39,11 @@ class Key < ActiveRecord::Base self.key = key.strip unless key.blank? end + def publishable_key + #Removes anything beyond the keytype and key itself + self.key.split[0..1].join(' ') + end + # projects that has this key def projects user.authorized_projects diff --git a/app/models/user.rb b/app/models/user.rb index 2beefb1d614..57145cc6b6e 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -619,7 +619,7 @@ class User < ActiveRecord::Base end def all_ssh_keys - keys.map(&:key) + keys.map(&:publishable_key) end def temp_oauth_email? |