Merge branch '208471-actionview-template-error-undefined-method-concat-for-nil-nilclass' into 'master'

Resolve "ActionView::Template::Error: undefined method `concat' for nil:NilClass"

Closes #208471

See merge request gitlab-org/gitlab!26395