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

CHANGELOG

Gemfile

Gemfile.lock

app/assets/javascripts/dispatcher.js.coffee

app/assets/stylesheets/base/mixins.scss

app/assets/stylesheets/generic/common.scss

app/assets/stylesheets/generic/lists.scss

app/assets/stylesheets/pages/projects.scss

app/assets/stylesheets/pages/search.scss

app/assets/stylesheets/pages/snippets.scss

app/controllers/admin/hooks_controller.rb

app/controllers/application_controller.rb

app/controllers/projects/hooks_controller.rb

app/controllers/projects/services_controller.rb

app/controllers/projects/snippets_controller.rb

app/finders/trending_projects_finder.rb

app/models/hooks/web_hook.rb

app/models/project_services/buildkite_service.rb

app/models/project_services/gitlab_ci_service.rb

app/views/admin/hooks/index.html.haml