Commit b063a46c authored by Dmytro Zaporozhets's avatar Dmytro Zaporozhets

Merge branch 'brodock/document-gitlab-shell' into 'master'

Add documentation to Gitlab::Shell

See merge request gitlab-org/gitlab!23388
parents 9fc4bacb e78e1db4
...@@ -96,8 +96,7 @@ class Key < ApplicationRecord ...@@ -96,8 +96,7 @@ class Key < ApplicationRecord
def remove_from_shell def remove_from_shell
GitlabShellWorker.perform_async( GitlabShellWorker.perform_async(
:remove_key, :remove_key,
shell_id, shell_id
key
) )
end end
......
This diff is collapsed.
...@@ -189,7 +189,7 @@ describe Key, :mailer do ...@@ -189,7 +189,7 @@ describe Key, :mailer do
it 'removes key from authorized_file' do it 'removes key from authorized_file' do
key = create(:personal_key) key = create(:personal_key)
expect(GitlabShellWorker).to receive(:perform_async).with(:remove_key, key.shell_id, key.key) expect(GitlabShellWorker).to receive(:perform_async).with(:remove_key, key.shell_id)
key.destroy key.destroy
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment