Merge branch 'master' into merge-if-green

.flayignore

.gitignore

.gitlab-ci.yml

CHANGELOG

CONTRIBUTING.md

GITLAB_GIT_HTTP_SERVER_VERSION

GITLAB_WORKHORSE

GITLAB_WORKHORSE_VERSION

Gemfile

Gemfile.lock

PROCESS.md

VERSION

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

...assets/javascripts/stat_graph_contributors_util.js.coffee

app/assets/stylesheets/framework/blocks.scss

app/assets/stylesheets/framework/buttons.scss