Fix spec warnings and template helper

Fixes https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20761/diffs#57358a912acee547d492049770af2128ded28e89

Ports EE change from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/6780

Related: https://gitlab.com/gitlab-org/gitlab-ee/issues/7083

• Changelog entry added, if necessary
• Documentation created/updated
• API support added
• Tests added for this feature/bug
• Conforms to the code review guidelines
  • Has been reviewed by a UX Designer
  • Has been reviewed by a Frontend maintainer
  • Has been reviewed by a Backend maintainer
  • Has been reviewed by a Database specialist
• Conforms to the merge request performance guidelines
• Conforms to the style guides
• Conforms to the database guides
• If you have multiple commits, please combine them into a few logically organized commits by squashing them
• Internationalization required/considered
• End-to-end tests pass (package-and-qa manual pipeline job)