Merge branch 'master' into developer_can_push_to_protected_branches_option

.gitignore

.ruby-version

CHANGELOG

Gemfile

Gemfile.lock

app/assets/javascripts/merge_request.js.coffee

app/assets/stylesheets/generic/common.scss

app/assets/stylesheets/generic/issue_box.scss

app/assets/stylesheets/generic/tables.scss

app/assets/stylesheets/main/variables.scss

app/assets/stylesheets/sections/header.scss

app/assets/stylesheets/sections/merge_requests.scss

app/assets/stylesheets/sections/sidebar.scss

app/assets/stylesheets/sections/tree.scss

app/controllers/application_controller.rb

app/controllers/oauth/applications_controller.rb

app/controllers/oauth/authorizations_controller.rb

app/controllers/oauth/authorized_applications_controller.rb

app/controllers/profiles_controller.rb

app/controllers/projects/services_controller.rb