From e14b27bb9438d1db689c7098c343eab5f3d579dd Mon Sep 17 00:00:00 2001 From: Nick Thomas Date: Mon, 4 Feb 2019 12:44:19 +0000 Subject: Merge branch 'sh-fix-detect-host-keys' into 'master' Fix Detect Host Keys not working Closes #56855 See merge request gitlab-org/gitlab-ce!24884 (cherry picked from commit 2b0f4df0217b4a4aee53f964610d66ceedb68dca) 4c1231ac Fix SSH Detect Host Keys not working --- app/models/ssh_host_key.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app') diff --git a/app/models/ssh_host_key.rb b/app/models/ssh_host_key.rb index 99a0c54a26a..f318d32c71c 100644 --- a/app/models/ssh_host_key.rb +++ b/app/models/ssh_host_key.rb @@ -54,7 +54,7 @@ class SshHostKey # Needed for reactive caching def self.primary_key - 'id' + :id end def id -- cgit v1.2.3