Merge branch 'master' into issue-board-sidebar

.gitlab-ci.yml

.rubocop.yml

.scss-lint.yml

CHANGELOG.md

app/assets/javascripts/activities.js

app/assets/javascripts/application.js

app/assets/javascripts/awards_handler.js

app/assets/javascripts/blob/template_selector.js.es6

app/assets/javascripts/boards/stores/boards_store.js.es6

app/assets/javascripts/build.js

app/assets/javascripts/cycle_analytics.js.es6

app/assets/javascripts/dispatcher.js.es6

app/assets/javascripts/extensions/element.js.es6

app/assets/javascripts/gl_field_errors.js.es6

app/assets/javascripts/issuable.js.es6

app/assets/javascripts/lib/utils/common_utils.js

app/assets/javascripts/members.js.es6

...s/javascripts/merge_conflicts/merge_conflict_store.js.es6

app/assets/javascripts/merge_request_tabs.js

app/assets/javascripts/pipelines.js.es6