CE upstream: Thursday
both modified: app/controllers/projects_controller.rb
both modified: app/models/concerns/discussion_on_diff.rb
both modified: app/views/projects/blob/_header.html.haml
both modified: lib/api/groups.rb
both modified: lib/api/issues.rb
both modified: lib/api/merge_requests.rb
both modified: lib/api/projects.rb
both modified: lib/api/settings.rb
both modified: lib/api/users.rb
both modified: lib/gitlab/database.rb
both modified: scripts/prepare_build.sh
both modified: spec/models/repository_spec.rb
both modified: spec/spec_helper.rb