Merge remote-tracking branch 'origin/master'

CHANGELOG

app/assets/javascripts/gl_dropdown.js.coffee

app/assets/javascripts/protected_branch_select.js.coffee

app/assets/javascripts/protected_branches.js.coffee

app/controllers/projects/protected_branches_controller.rb

app/models/project.rb

app/models/protected_branch.rb

...iews/projects/protected_branches/_branches_list.html.haml

app/views/projects/protected_branches/_dropdown.html.haml

...ws/projects/protected_branches/_matching_branch.html.haml

...s/projects/protected_branches/_protected_branch.html.haml

app/views/projects/protected_branches/index.html.haml

app/views/projects/protected_branches/show.html.haml

config/routes.rb

doc/workflow/protected_branches.md

doc/workflow/protected_branches/protected_branches1.png

doc/workflow/protected_branches/protected_branches2.png

doc/workflow/protected_branches/protected_branches3.png

lib/gitlab/git/hook.rb

spec/features/protected_branches_spec.rb