Merge branch 'master' into 'badge-color-on-white-bg'

.gitlab-ci.yml

.rubocop.yml

CHANGELOG.md

GITLAB_SHELL_VERSION

GITLAB_WORKHORSE_VERSION

Gemfile

Gemfile.lock

app/assets/javascripts/api.js

app/assets/javascripts/blob/blob_dockerfile_selector.js.es6

app/assets/javascripts/blob/blob_dockerfile_selectors.js.es6

app/assets/javascripts/blob_edit/edit_blob.js

app/assets/javascripts/dispatcher.js.es6

...ts/javascripts/environments/components/environment.js.es6

...vascripts/environments/components/environment_item.js.es6

...nvironments/components/environment_terminal_button.js.es6

app/assets/javascripts/gfm_auto_complete.js.es6

app/assets/javascripts/gl_dropdown.js

app/assets/javascripts/gl_form.js

app/assets/javascripts/issuable_form.js

app/assets/javascripts/merge_request.js