Commit 98343637 authored by Douwe Maan's avatar Douwe Maan
Browse files

Merge branch 'remove-readonly-exclusion-from-systemcheck' into 'master'

Remove an exception from the git user default SSH config check

See merge request gitlab-org/gitlab-ce!15151
...@@ -11,10 +11,10 @@ class GitUserDefaultSSHConfigCheck < SystemCheck::BaseCheck ...@@ -11,10 +11,10 @@ class GitUserDefaultSSHConfigCheck < SystemCheck::BaseCheck
].freeze ].freeze
set_name 'Git user has default SSH configuration?' set_name 'Git user has default SSH configuration?'
set_skip_reason 'skipped (GitLab read-only, or git user is not present / configured)' set_skip_reason 'skipped (git user is not present / configured)'
def skip? def skip?
Gitlab::Database.read_only? || !home_dir || !File.directory?(home_dir) !home_dir || !File.directory?(home_dir)
end end
def check? def check?
......
...@@ -39,14 +39,6 @@ ...@@ -39,14 +39,6 @@
it { is_expected.to eq(expected_result) } it { is_expected.to eq(expected_result) }
end end
it 'skips GitLab read-only instances' do
stub_user
stub_home_dir
allow(Gitlab::Database).to receive(:read_only?).and_return(true)
is_expected.to be_truthy
end
end end
describe '#check?' do describe '#check?' do
......
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