diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-02-04 15:44:19 +0300 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-02-05 21:27:12 +0300 |
| commit | e14b27bb9438d1db689c7098c343eab5f3d579dd (patch) | |
| tree | 6a512290843fa64d859a3bbcffe797de21c4d9d5 /app | |
| parent | f8671e4c1dc076af86ecf0c323b166c8390f19b2 (diff) | |
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
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/ssh_host_key.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |