Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42

2 files changed, 4 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 2876f1eb688..3ae36087f6b 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
@@ -31,7 +31,7 @@ module SystemCheck
         end
 
         try_fixing_it("mkdir #{backup_dir}", *instructions)
-        for_more_information('doc/ssh/index.md in section "Overriding SSH settings on the GitLab server"')
+        for_more_information('doc/user/ssh.md#overriding-ssh-settings-on-the-gitlab-server')
         fix_and_rerun
       end
 
diff --git a/lib/system_check/base_check.rb b/lib/system_check/base_check.rb
index c36cacbaf4f..ae3a9412e5c 100644
--- a/lib/system_check/base_check.rb
+++ b/lib/system_check/base_check.rb
@@ -64,20 +64,14 @@ module SystemCheck
       call_or_return(@skip_reason) || 'skipped'
     end
 
-    # Define a reason why we skipped the SystemCheck (during runtime)
+    # Define or get a reason why we skipped the SystemCheck (during runtime)
     #
     # This is used when you need dynamic evaluation like when you have
     # multiple reasons why a check can fail
     #
     # @param [String] reason to be displayed
-    attr_writer :skip_reason
-
-    # Skip reason defined during runtime
-    #
-    # This value have precedence over the one defined in the subclass
-    #
-    # @return [String] the reason
-    attr_reader :skip_reason
+    # @return [String] reason to be displayed
+    attr_accessor :skip_reason
 
     # Does the check support automatically repair routine?
     #