Merge branch 'master' into 23535-folders-in-wiki-repository

.eslintrc

.gitlab-ci.yml

.haml-lint.yml

.rubocop.yml

.rubocop_todo.yml

CHANGELOG.md

CONTRIBUTING.md

GITLAB_WORKHORSE_VERSION

Gemfile

Gemfile.lock

README.md

VERSION

app/assets/javascripts/admin.js

app/assets/javascripts/api.js

app/assets/javascripts/application.js

app/assets/javascripts/aside.js

app/assets/javascripts/autosave.js

app/assets/javascripts/awards_handler.js

app/assets/javascripts/behaviors/autosize.js

app/assets/javascripts/behaviors/details_behavior.js