diff options
author | Ian Baum <ibaum@gitlab.com> | 2018-02-12 22:05:31 +0300 |
---|---|---|
committer | Ian Baum <ibaum@gitlab.com> | 2018-02-12 22:06:57 +0300 |
commit | e607fd796657afd214b8f25201919d3e33b3f35f (patch) | |
tree | a15d22d1963efdfd168f30b5a385fad68d9aa1ec /app | |
parent | 769f732111a4479e540eeb61eff9f609fb683a2d (diff) |
Merge branch 'rd-43185-revert-sanitize-extra-blank-spaces-used-when-uploading-a-ssh-key' into 'master'
Revert "Merge branch 'rd-40552-gitlab-should-check-if-keys-are-valid-before-saving' into 'master'"
See merge request gitlab-org/gitlab-ce!17062
Diffstat (limited to 'app')
-rw-r--r-- | app/models/key.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/models/key.rb b/app/models/key.rb index ae5769c0627..7406c98c99e 100644 --- a/app/models/key.rb +++ b/app/models/key.rb @@ -33,8 +33,9 @@ class Key < ActiveRecord::Base after_destroy :refresh_user_cache def key=(value) - write_attribute(:key, value.present? ? Gitlab::SSHPublicKey.sanitize(value) : nil) - + value&.delete!("\n\r") + value.strip! unless value.blank? + write_attribute(:key, value) @public_key = nil end @@ -96,7 +97,7 @@ class Key < ActiveRecord::Base def generate_fingerprint self.fingerprint = nil - return unless public_key.valid? + return unless self.key.present? self.fingerprint = public_key.fingerprint end |