Merge branch 'master' into cronjobs

# Conflicts:
#	Gemfile
#	Gemfile.lock

Gemfile

@@ -7,16 +7,18 @@ gem 's3',              github: 'travis-ci/s3'
 
 gem 'travis-core',     github: 'travis-ci/travis-core'
 gem 'travis-support',  github: 'travis-ci/travis-support'
+gem 'travis-amqp',     github: 'travis-ci/travis-amqp'
 gem 'travis-config',   '~> 0.1.0'
 gem 'travis-sidekiqs', github: 'travis-ci/travis-sidekiqs', require: nil
 gem 'travis-yaml',     github: 'travis-ci/travis-yaml'
+gem 'travis-migrations', github: 'travis-ci/travis-migrations'
 gem 'mustermann',      github: 'rkh/mustermann'
 gem 'sinatra'
 gem 'sinatra-contrib', require: nil #github: 'sinatra/sinatra-contrib', require: nil
 
 gem 'active_model_serializers'
 gem 'unicorn'
-gem 'sentry-raven',    github: 'getsentry/raven-ruby'
+gem 'sentry-raven'
 gem 'yard-sinatra',    github: 'rkh/yard-sinatra'
 gem 'rack-contrib',    github: 'rack/rack-contrib'
 gem 'rack-cache',      github: 'rtomayko/rack-cache'
@@ -42,7 +44,6 @@ group :test do
   gem 'mocha',         '~> 0.12'
   gem 'database_cleaner', '~> 0.8.0'
   gem 'timecop',       '~> 0.8.0'
-  gem 'travis-migrations', github: 'travis-ci/travis-migrations'
 end
 
 group :development do

Gemfile.lock

@@ -5,14 +5,6 @@ GIT
     metriks-librato_metrics (1.0.2)
       metriks (>= 0.9.9.6)
 
-GIT
-  remote: git://github.com/getsentry/raven-ruby.git
-  revision: 84392e5db701f0b5c66802aab9cc82ef9a5ad830
-  specs:
-    sentry-raven (0.10.1)
-      faraday (>= 0.7.6)
-      uuidtools
-
 GIT
   remote: git://github.com/rack/rack-contrib.git
   revision: 1b11346d729efd88b274cd7f704e0bca9eb3de7a
@@ -48,6 +40,12 @@ GIT
     s3 (0.3.21)
       proxies (~> 0.2.0)
 
+GIT
+  remote: git://github.com/travis-ci/travis-amqp.git
+  revision: c388299757b7eda2cc0e33cdc7d90113cf283e6a
+  specs:
+    travis-amqp (0.0.1)
+
 GIT
   remote: git://github.com/travis-ci/travis-core.git
   revision: f7b3a76b3f39c28bb5cf7b9dc24acec13908a11a
@@ -286,6 +284,8 @@ GEM
       rspec-core (>= 2.99.0.beta1)
       rspec-expectations (>= 2.99.0.beta1)
     rspec-mocks (2.99.2)
+    sentry-raven (0.15.3)
+      faraday (>= 0.7.6)
     sidekiq (3.3.0)
       celluloid (>= 0.16.0)
       connection_pool (>= 2.0.0)
@@ -338,7 +338,6 @@ GEM
       rack
       raindrops (~> 0.7)
     useragent (0.13.3)
-    uuidtools (2.1.5)
     virtus (1.0.5)
       axiom-types (~> 0.1)
       coercible (~> 1.0)
@@ -374,13 +373,14 @@ DEPENDENCIES
   rspec (~> 2.13)
   rspec-its
   s3!
-  sentry-raven!
+  sentry-raven
   simplecov
   sinatra
   sinatra-contrib
   skylight (~> 0.6.0.beta.1)
   stackprof
   timecop (~> 0.8.0)
+  travis-amqp!
   travis-api!
   travis-config (~> 0.1.0)
   travis-core!

lib/travis/api/app.rb

@@ -4,12 +4,14 @@ require 'active_record_postgres_variables'
 
 # now actually load travis
 require 'travis'
+require 'travis/amqp'
 require 'travis/model'
-require 'travis/support/amqp'
 require 'travis/states_cache'
 require 'rack'
 require 'rack/protection'
-require 'rack/contrib'
+require 'rack/contrib/config'
+require 'rack/contrib/jsonp'
+require 'rack/contrib/post_body_content_type_parser'
 require 'dalli'
 require 'memcachier'
 require 'rack/cache'
@@ -18,6 +20,7 @@ require 'active_record'
 require 'redis'
 require 'gh'
 require 'raven'
+require 'raven/integrations/rack'
 require 'sidekiq'
 require 'metriks/reporter/logger'
 require 'metriks/librato_metrics_reporter'
@@ -178,7 +181,7 @@ module Travis::Api
 
       def self.setup_travis
         Travis::Async.enabled = true
-        Travis::Amqp.config = Travis.config.amqp
+        Travis::Amqp.setup(Travis.config.amqp)
 
         setup_database_connections