Merge branch 'master' into issue_14678

.rubocop.yml

CHANGELOG

CONTRIBUTING.md

GITLAB_SHELL_VERSION

Gemfile

Gemfile.lock

app/assets/javascripts/awards_handler.coffee

app/assets/javascripts/compare.js.coffee

app/assets/javascripts/gl_dropdown.js.coffee

app/assets/javascripts/merge_request_tabs.js.coffee

app/assets/javascripts/milestone_select.js.coffee

app/assets/javascripts/sidebar.js.coffee

app/assets/javascripts/subscription.js.coffee

app/assets/javascripts/todos.js.coffee

app/assets/stylesheets/framework/buttons.scss

app/assets/stylesheets/framework/dropdowns.scss

app/assets/stylesheets/framework/files.scss

app/assets/stylesheets/framework/gitlab-theme.scss

app/assets/stylesheets/framework/header.scss

app/assets/stylesheets/framework/sidebar.scss