Skip to content
Snippets Groups Projects

Default `authorized_keys_enabled` setting to true

Merged Michael Kozono requested to merge fix-authorized-keys-enabled-default-2738 into master
All threads resolved!
Compare and Show latest version
10 files
+ 437
134
Compare changes
  • Side-by-side
  • Inline
Files
10
@@ -4,19 +4,6 @@ class GitlabShellWorker
@@ -4,19 +4,6 @@ class GitlabShellWorker
include DedicatedSidekiqQueue
include DedicatedSidekiqQueue
def perform(action, *arg)
def perform(action, *arg)
if action.to_s == 'batch_add_keys_in_db_starting_from'
gitlab_shell.send(action, *arg)
batch_add_keys_in_db_starting_from(arg.first)
else
gitlab_shell.send(action, *arg)
end
end
# Not added to Gitlab::Shell because I don't expect this to be used again
def batch_add_keys_in_db_starting_from(start_id)
gitlab_shell.batch_add_keys do |adder|
Key.find_each(start: start_id, batch_size: 1000) do |key|
adder.add_key(key.shell_id, key.key)
end
end
end
end
end
end
Loading