Commit Graph

6 Commits

Author SHA1 Message Date
GitLab Bot 32bbedbc21 Add latest changes from gitlab-org/gitlab@master 2022-03-31 21:08:16 +00:00
GitLab Bot fa7ac2663b Add latest changes from gitlab-org/gitlab@master 2020-06-24 06:09:01 +00:00
Thong Kuah a2cfc150ce Add # frozen_string_literal to spec/models
Adds `# frozen_string_literal: true` to spec/models ruby files
2019-04-01 14:37:54 +13:00
Nick Thomas 3dadb1f870
Allow SshHostKey.find_by to accept string keys 2019-02-04 12:52:22 +00:00
Stan Hu 4c1231acca Fix SSH Detect Host Keys not working
Due to a change in
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/24245, the Detect
Host Key feature in the SSH mirroring stopped working.
`SshHostKey#primary_key` was being used instead of the hard-coded
`:id`. However, `SshHostKey#find_by` was expecting the symbolized `:id`
rather than the string `id`, so it could never find the host key it was
supposed to update.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56855
2019-02-03 06:12:05 -08:00
Nick Thomas 324ff19571
Backport SSH host key detection code to CE
This functionality is needed for SSH push mirroring support, which is a
CE feature.
2018-10-25 13:51:45 +01:00