Merge branch 'master' into ui/issuable-filter

Gemfile.lock

app/assets/stylesheets/framework.scss

app/assets/stylesheets/framework/blocks.scss

app/assets/stylesheets/framework/common.scss

app/assets/stylesheets/framework/files.scss

app/assets/stylesheets/framework/forms.scss

app/assets/stylesheets/framework/issue_box.scss

app/assets/stylesheets/framework/layout.scss

app/assets/stylesheets/framework/panels.scss

app/assets/stylesheets/framework/sidebar.scss

app/assets/stylesheets/framework/tables.scss

app/assets/stylesheets/framework/typography.scss

app/assets/stylesheets/pages/commit.scss

app/assets/stylesheets/pages/editor.scss

app/assets/stylesheets/pages/issuable.scss

app/assets/stylesheets/pages/login.scss

app/assets/stylesheets/pages/merge_requests.scss

app/assets/stylesheets/pages/note_form.scss

app/assets/stylesheets/pages/projects.scss

app/assets/stylesheets/pages/snippets.scss