squashed merge and fixed conflicts

.gitlab-ci.yml

.rubocop.yml

CHANGELOG

Gemfile

Gemfile.lock

app/assets/javascripts/LabelManager.js.coffee

app/assets/javascripts/application.js.coffee

app/assets/javascripts/awards_handler.coffee

app/assets/javascripts/ci/build.coffee

app/assets/javascripts/dispatcher.js.coffee

app/assets/javascripts/due_date_select.js.coffee

app/assets/javascripts/issuable.js.coffee

app/assets/javascripts/issuable_form.js.coffee

app/assets/javascripts/issues-bulk-assignment.js.coffee

app/assets/javascripts/labels_select.js.coffee

app/assets/javascripts/layout_nav.js.coffee

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

app/assets/javascripts/logo.js.coffee

app/assets/javascripts/merged_buttons.js.coffee

app/assets/javascripts/milestone_select.js.coffee