summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-10-04 08:06:49 +0000
committerDouwe Maan <douwe@gitlab.com>2017-10-04 08:06:49 +0000
commitf0b4fe2fc2c1e89e67b236b640f8fe31aa37e73a (patch)
tree5a5358c8e5e15d74284ee8c34d0ddbaab3b6a6c5 /app/models
parentc958c201b72577eb01662cc1dac0f253e3d3e6db (diff)
parenteaa1ce4fbed93cc1af95e96c3ff435ff0ec59863 (diff)
downloadgitlab-ce-f0b4fe2fc2c1e89e67b236b640f8fe31aa37e73a.tar.gz
Merge branch 'fix-ssh-key-mutation' into 'master'
Ensure key fingerprints are generated correctly when modified See merge request gitlab-org/gitlab-ce!14663
Diffstat (limited to 'app/models')
-rw-r--r--app/models/key.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/key.rb b/app/models/key.rb
index 0c41e34d969..f119b15c737 100644
--- a/app/models/key.rb
+++ b/app/models/key.rb
@@ -34,6 +34,7 @@ class Key < ActiveRecord::Base
value&.delete!("\n\r")
value.strip! unless value.blank?
write_attribute(:key, value)
+ @public_key = nil
end
def publishable_key