Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into new-guides-guidelines

.babelrc

.gitattributes

.gitlab-ci.yml

.gitlab/issue_templates/Feature Proposal.md

CHANGELOG.md

CONTRIBUTING.md

GITALY_SERVER_VERSION

GITLAB_WORKHORSE_VERSION

Gemfile

Gemfile.lock

README.md

app/assets/images/icon-merge-request-unmerged.svg

app/assets/javascripts/activities.js

app/assets/javascripts/awards_handler.js

app/assets/javascripts/behaviors/gl_emoji.js

...ets/javascripts/behaviors/gl_emoji/is_emoji_name_valid.js

app/assets/javascripts/behaviors/toggler_behavior.js

app/assets/javascripts/blob/blob_ci_yaml.js

app/assets/javascripts/blob/blob_dockerfile_selector.js

app/assets/javascripts/blob/blob_dockerfile_selectors.js