GitLab

This style change enforces `return if ...` instead of
`return nil if ...` to save maintainers a few minor review points.

Style change discussed in
https://gitlab.com/gitlab-org/gitlab-ce/issues/57454