Merge master into branch

CHANGELOG

app/assets/javascripts/dispatcher.js

app/assets/javascripts/merge_conflict_data_provider.js.es6

app/assets/javascripts/merge_conflict_resolver.js.es6

app/assets/javascripts/merge_request_tabs.js

app/assets/javascripts/merge_request_widget.js

app/assets/stylesheets/behaviors.scss

app/assets/stylesheets/framework/mixins.scss

app/assets/stylesheets/highlight/dark.scss

app/assets/stylesheets/highlight/monokai.scss

app/assets/stylesheets/highlight/solarized_dark.scss

app/assets/stylesheets/highlight/solarized_light.scss

app/assets/stylesheets/highlight/white.scss

app/assets/stylesheets/pages/merge_conflicts.scss

app/assets/stylesheets/pages/pipelines.scss

app/controllers/projects/merge_requests_controller.rb

app/helpers/commits_helper.rb

app/helpers/nav_helper.rb

app/models/diff_note.rb

app/models/merge_request.rb