Merge branch 'master' into ph-inline-js

.nvmrc

CHANGELOG.md

CONTRIBUTING.md

Gemfile

Gemfile.lock

app/assets/javascripts/dispatcher.js

app/assets/javascripts/how_to_merge.js

...ssets/javascripts/merge_conflicts/merge_conflict_store.js

...e_merge_request_widget/components/mr_widget_deployment.js

...merge_request_widget/components/mr_widget_memory_usage.js

app/assets/stylesheets/new_nav.scss

app/assets/stylesheets/pages/issuable.scss

app/assets/stylesheets/pages/pipelines.scss

app/controllers/admin/application_settings_controller.rb

app/controllers/admin/dashboard_controller.rb

app/controllers/projects/application_controller.rb

app/controllers/projects/merge_requests_controller.rb

app/controllers/projects_controller.rb

app/finders/issuable_finder.rb

app/helpers/system_note_helper.rb