Merge branch 'master' into diff-line-comment-vuejs

.gitlab-ci.yml

CHANGELOG

Gemfile.lock

app/assets/javascripts/api.js

app/assets/javascripts/application.js

app/assets/javascripts/blob/template_selector.js

app/assets/javascripts/dispatcher.js

app/assets/javascripts/issuable.js

app/assets/javascripts/protected_branch_create.js.es6

app/assets/javascripts/protected_branch_edit.js.es6

...s/javascripts/templates/issuable_template_selector.js.es6

.../javascripts/templates/issuable_template_selectors.js.es6

app/assets/stylesheets/framework/buttons.scss

app/assets/stylesheets/framework/dropdowns.scss

app/assets/stylesheets/framework/highlight.scss

app/assets/stylesheets/pages/issuable.scss

app/assets/stylesheets/pages/merge_requests.scss

app/assets/stylesheets/pages/projects.scss

app/assets/stylesheets/pages/todos.scss

app/controllers/admin/spam_logs_controller.rb