CE upstream

Unmerged paths:
  (use "git add <file>..." to mark resolution)

	both modified:   app/views/projects/branches/index.html.haml
	both modified:   app/views/projects/commits/show.html.haml
	both modified:   app/views/projects/tags/index.html.haml
	both added:      app/views/shared/web_hooks/_form.html.haml
	both modified:   lib/gitlab/auth.rb

Guys, please resolve these conflicts:

@annabeldunstone or @dzaporozhets

• app/views/projects/branches/index.html.haml
• app/views/projects/commits/show.html.haml
• app/views/projects/tags/index.html.haml

@iamphill

• app/views/shared/web_hooks/_form.html.haml

@jacobvosmaer-gitlab

• lib/gitlab/auth.rb