Skip to content

Remove no longer needed fix

Michael Kozono requested to merge mk/remove-no-longer-needed-fix into master

What does this MR do and why?

My reading of https://gitlab.com/gitlab-org/gitlab/-/blob/a87bf943e55d1e342a3275f2bddf1838f8d7c9dc/lib/tasks/gitlab/shell.rake#L114-129 is that we were being cautious and rebuilding the authorized_keys file even when it appeared to be disabled, because there was previously a bug which caused the setting to be disabled for some people.

5 years later, I think we can reasonably assert that anyone who has that setting disabled has it disabled intentionally.

If so, then we just need to remove that bandaid, and we can even skip the whole task if "Write to authorized_keys file" is disabled

  • Remove no longer needed fix.
  • Don't rebuild the authorized_keys file when Write to authorized_keys file setting is disabled.
  • Don't block restores with Do you want to permanently enable the "Write to authorized_keys file" setting now? when Write to authorized_keys file setting is disabled.

Resolves #414946 (closed)

Changelog: fixed

Screenshots or screen recordings

Screenshots are required for UI changes, and strongly recommended for all other merge requests.

Before After

How to set up and validate locally

Numbered steps to set up and validate the change are strongly suggested.

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

Edited by Michael Kozono

Merge request reports