Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ce_upstream

.gitlab-ci.yml

CHANGELOG

Gemfile

Gemfile.lock

app/assets/javascripts/application.js.coffee

app/assets/javascripts/autosave.js.coffee

app/assets/javascripts/logo.js.coffee

app/assets/javascripts/merge_request_tabs.js.coffee

app/assets/javascripts/profile.js.coffee

app/assets/stylesheets/application.scss

app/assets/stylesheets/framework.scss

app/assets/stylesheets/framework/lists.scss

app/assets/stylesheets/framework/mixins.scss

app/assets/stylesheets/framework/progress.scss

app/assets/stylesheets/framework/sidebar.scss

app/assets/stylesheets/framework/variables.scss

app/assets/stylesheets/pages/issues.scss

app/assets/stylesheets/pages/merge_requests.scss

app/assets/stylesheets/pages/notes.scss

app/assets/stylesheets/pages/profile.scss