Merge branch 'master' into mwessel/gitlab-ce-configure-protection

.rubocop.yml

CHANGELOG

GITLAB_SHELL_VERSION

Gemfile

Gemfile.lock

app/assets/javascripts/calendar.js.coffee

app/assets/javascripts/sidebar.js.coffee

app/assets/stylesheets/generic/avatar.scss

app/assets/stylesheets/sections/dashboard.scss

app/assets/stylesheets/sections/diff.scss

app/assets/stylesheets/sections/nav_sidebar.scss

app/controllers/github_imports_controller.rb

app/controllers/namespaces_controller.rb

app/controllers/projects/blob_controller.rb

app/controllers/projects/commit_controller.rb

app/controllers/projects/raw_controller.rb

app/controllers/projects/refs_controller.rb

app/controllers/projects/wikis_controller.rb

app/controllers/snippets_controller.rb

app/controllers/users_controller.rb