Merge branch 'master' into contributor-graph-by-email

.flayignore

.gitignore

.gitlab-ci.yml

CHANGELOG

CONTRIBUTING.md

GITLAB_GIT_HTTP_SERVER_VERSION

GITLAB_WORKHORSE

GITLAB_WORKHORSE_VERSION

Gemfile

Gemfile.lock

PROCESS.md

app/assets/images/auth_buttons/facebook_64.png

app/assets/javascripts/blob/edit_blob.js.coffee

app/assets/javascripts/blob/new_blob.js.coffee

app/assets/javascripts/calendar.js.coffee

app/assets/javascripts/dispatcher.js.coffee

app/assets/javascripts/notes.js.coffee

app/assets/stylesheets/framework/blocks.scss

app/assets/stylesheets/framework/buttons.scss

app/assets/stylesheets/framework/callout.scss