Merge branch 'master' into remove-forks-from-projects-settings

CHANGELOG

app/assets/stylesheets/application.scss

app/assets/stylesheets/framework.scss

app/assets/stylesheets/framework/avatar.scss

app/assets/stylesheets/framework/blocks.scss

app/assets/stylesheets/framework/buttons.scss

app/assets/stylesheets/framework/calendar.scss

app/assets/stylesheets/framework/callout.scss

app/assets/stylesheets/framework/common.scss

app/assets/stylesheets/framework/files.scss

app/assets/stylesheets/framework/filters.scss

app/assets/stylesheets/framework/flash.scss

app/assets/stylesheets/framework/fonts.scss

app/assets/stylesheets/framework/forms.scss

app/assets/stylesheets/framework/gfm.scss

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

app/assets/stylesheets/framework/header.scss

app/assets/stylesheets/framework/highlight.scss

app/assets/stylesheets/framework/issue_box.scss

app/assets/stylesheets/framework/jquery.scss