Commit graph

9 commits

Author SHA1 Message Date
GitLab Bot
be4b3134a2 Add latest changes from gitlab-org/gitlab@master 2021-05-04 15:10:36 +00:00
GitLab Bot
735e7717e7 Add latest changes from gitlab-org/gitlab@master 2020-05-24 12:08:20 +00:00
GitLab Bot
cfc6fe5100 Add latest changes from gitlab-org/gitlab@master 2020-04-24 21:09:48 +00:00
Mayra Cabrera
0ab89d8e36 Add a rubocop for Rails.logger
Suggests to use a JSON structured log instead

Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/54102
2019-07-10 19:26:47 +00:00
Andrew Newdigate
3288e1a874 Adds the Rubocop ReturnNil cop
This style change enforces `return if ...` instead of
`return nil if ...` to save maintainers a few minor review points
2019-03-06 17:51:56 +02: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
Peter Leitzen
9f25383613
Implement SshHostKey.primary_key method 2019-01-08 22:43:25 +01: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