diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-08-18 17:49:32 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2016-08-18 17:54:07 +0300 |
| commit | 8b1656282bcc39a0c1c7a3dccf74c98b1c3adae2 (patch) | |
| tree | a5375c1ff8150d7777a120f29cfbd4d544ca4865 /app/models/key.rb | |
| parent | 21a73302e8a8b9f22e51f1707a306f04d3faad07 (diff) | |
| parent | 2c1062f81e3c39cf8a45185c203995a43b91bf65 (diff) | |
Merge branch 'master' into expiration-date-on-memberships
Diffstat (limited to 'app/models/key.rb')
| -rw-r--r-- | app/models/key.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/models/key.rb b/app/models/key.rb index b9bc38a0436..568a60b8af3 100644 --- a/app/models/key.rb +++ b/app/models/key.rb @@ -26,8 +26,9 @@ class Key < ActiveRecord::Base end def publishable_key - # Removes anything beyond the keytype and key itself - self.key.split[0..1].join(' ') + # Strip out the keys comment so we don't leak email addresses + # Replace with simple ident of user_name (hostname) + self.key.split[0..1].push("#{self.user_name} (#{Gitlab.config.gitlab.host})").join(' ') end # projects that has this key |