Merge branch 'master' into full-width-tables

app/controllers/projects/issues_controller.rb

app/controllers/projects/merge_requests_controller.rb

app/controllers/projects/milestones_controller.rb

app/controllers/projects/notes_controller.rb

app/controllers/projects/project_members_controller.rb

app/controllers/projects/services_controller.rb

app/controllers/projects_controller.rb

app/finders/issuable_finder.rb

app/helpers/diff_helper.rb

app/mailers/abuse_report_mailer.rb

app/models/application_setting.rb

app/models/commit.rb

app/models/merge_request.rb

app/models/merge_request_diff.rb

app/models/milestone.rb

app/models/repository.rb

app/views/abuse_report_mailer/notify.html.haml

app/views/abuse_report_mailer/notify.text.haml

app/views/admin/application_settings/_form.html.haml

app/views/admin/users/_profile.html.haml