Merge remote-tracking branch 'origin/master' into docker-registry-view

CHANGELOG

app/assets/javascripts/notes.js.coffee

app/assets/stylesheets/framework/gitlab-theme.scss

app/assets/stylesheets/pages/notes.scss

app/controllers/admin/application_settings_controller.rb

app/controllers/admin/users_controller.rb

app/controllers/projects/commit_controller.rb

app/controllers/projects/compare_controller.rb

app/controllers/projects/merge_requests_controller.rb

app/controllers/projects/notes_controller.rb

app/controllers/registrations_controller.rb

app/finders/issuable_finder.rb

app/finders/notes_finder.rb

app/helpers/diff_helper.rb

app/helpers/events_helper.rb

app/helpers/notes_helper.rb

app/models/application_setting.rb

app/models/event.rb

app/models/legacy_diff_note.rb

app/models/merge_request.rb