Merge branch 'master' into 'balsalmiq-support'

.eslintrc

.gitlab-ci.yml

CHANGELOG.md

app/assets/javascripts/boards/boards_bundle.js

app/assets/javascripts/build.js

app/assets/javascripts/commit/pipelines/pipelines_table.js

...vascripts/vue_pipelines_index/components/async_button.vue

...javascripts/vue_pipelines_index/components/empty_state.js

...avascripts/vue_pipelines_index/components/empty_state.vue

...javascripts/vue_pipelines_index/components/error_state.js

...avascripts/vue_pipelines_index/components/error_state.vue

app/assets/javascripts/vue_pipelines_index/pipelines.js

.../javascripts/vue_shared/components/pipelines_table_row.js

app/assets/stylesheets/pages/merge_requests.scss

app/controllers/projects/compare_controller.rb

app/controllers/projects/merge_requests_controller.rb

app/controllers/projects_controller.rb

app/helpers/blob_helper.rb

app/helpers/diff_helper.rb

app/helpers/notes_helper.rb