diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-11-02 15:03:56 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2017-11-02 15:03:56 +0000 |
commit | 983436375690348c88fa79e4974c5267afb5b0ce (patch) | |
tree | ff0d7f3a004405da2964bd0fe2f9a05f96c2eafd | |
parent | 1273a9c951c5d3267324b20787b25d06d13ef8ef (diff) | |
parent | 2f0f62e58809c3f6eaee684cfd1a1d6a6bfd8b55 (diff) | |
download | gitlab-ce-983436375690348c88fa79e4974c5267afb5b0ce.tar.gz |
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
-rw-r--r-- | lib/system_check/app/git_user_default_ssh_config_check.rb | 4 | ||||
-rw-r--r-- | spec/lib/system_check/app/git_user_default_ssh_config_check_spec.rb | 8 |
2 files changed, 2 insertions, 10 deletions
diff --git a/lib/system_check/app/git_user_default_ssh_config_check.rb b/lib/system_check/app/git_user_default_ssh_config_check.rb index 9af21078403..ad41760dff2 100644 --- a/lib/system_check/app/git_user_default_ssh_config_check.rb +++ b/lib/system_check/app/git_user_default_ssh_config_check.rb @@ -11,10 +11,10 @@ module SystemCheck ].freeze 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? - Gitlab::Database.read_only? || !home_dir || !File.directory?(home_dir) + !home_dir || !File.directory?(home_dir) end def check? diff --git a/spec/lib/system_check/app/git_user_default_ssh_config_check_spec.rb b/spec/lib/system_check/app/git_user_default_ssh_config_check_spec.rb index b4b83b70d1c..a0fb86345f3 100644 --- a/spec/lib/system_check/app/git_user_default_ssh_config_check_spec.rb +++ b/spec/lib/system_check/app/git_user_default_ssh_config_check_spec.rb @@ -39,14 +39,6 @@ describe SystemCheck::App::GitUserDefaultSSHConfigCheck do it { is_expected.to eq(expected_result) } 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 describe '#check?' do |