Merge commit '4c53cc0e' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g

* commit '4c53cc0e':
  rubocop satisfy

Conflicts:
	app/controllers/ci/builds_controller.rb
	app/controllers/ci/commits_controller.rb