diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-11-06 15:43:24 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-11-06 15:43:24 +0000 |
| commit | 1208d55206128266690f46f0165df0fc10c24941 (patch) | |
| tree | 93fbdde5a5db6cdd8f79f2806707dab093985aa2 /app/models/key.rb | |
| parent | d171ff60168cd55b6d7b9ee920269f44a26e577e (diff) | |
| parent | d0c58a97c8a053c0beec7c13c1c6ec5042120ef1 (diff) | |
| download | gitlab-ce-1208d55206128266690f46f0165df0fc10c24941.tar.gz | |
Merge branch 'master' into 'refactor-snippets-finder'refactor-snippets-finder
# Conflicts:
# spec/models/project_spec.rb
Diffstat (limited to 'app/models/key.rb')
| -rw-r--r-- | app/models/key.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/key.rb b/app/models/key.rb index bdb83e12793..8f93418b88b 100644 --- a/app/models/key.rb +++ b/app/models/key.rb @@ -34,6 +34,10 @@ class Key < ActiveRecord::Base after_destroy :post_destroy_hook after_destroy :refresh_user_cache + def self.regular_keys + where(type: ['Key', nil]) + end + def key=(value) write_attribute(:key, value.present? ? Gitlab::SSHPublicKey.sanitize(value) : nil) |