diff --git a/Gemfile.lock b/Gemfile.lock index 5dac3a14..464c0689 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -66,6 +66,7 @@ PATH hubble (~> 0.1) newrelic_rpm (~> 3.3.0) pg (~> 0.13.2) + rack-contrib (~> 1.1) rack-ssl (~> 1.3) redcarpet (~> 2.1) sinatra (~> 1.3) @@ -107,13 +108,13 @@ GEM avl_tree (1.1.3) backports (2.6.4) builder (3.0.3) - daemons (1.1.8) + daemons (1.1.9) data_migrations (0.0.1) activerecord rake diff-lcs (1.1.3) erubis (2.7.0) - eventmachine (0.12.10) + eventmachine (1.0.0) factory_girl (2.4.2) activesupport faraday (0.8.4) @@ -163,6 +164,8 @@ GEM rack (1.4.1) rack-cache (1.2) rack (>= 0.4) + rack-contrib (1.1.0) + rack (>= 0.9.1) rack-protection (1.2.0) rack rack-ssl (1.3.2) @@ -201,7 +204,7 @@ GEM simple_states (0.1.1) activesupport hashr (~> 0.0.10) - sinatra (1.3.2) + sinatra (1.3.3) rack (~> 1.3, >= 1.3.6) rack-protection (~> 1.2) tilt (~> 1.3, >= 1.3.3) diff --git a/lib/travis/api/app.rb b/lib/travis/api/app.rb index 458a06e6..7a06db03 100644 --- a/lib/travis/api/app.rb +++ b/lib/travis/api/app.rb @@ -6,6 +6,7 @@ require 'travis' require 'backports' require 'rack' require 'rack/protection' +require 'rack/contrib' require 'active_record' require 'redis' require 'gh' @@ -52,6 +53,7 @@ class Travis::Api::App @app = Rack::Builder.app do use Rack::Protection::PathTraversal use Rack::SSL if Endpoint.production? + use Rack::JSONP use ActiveRecord::ConnectionAdapters::ConnectionManagement use Rack::Config do |env| diff --git a/travis-api.gemspec b/travis-api.gemspec index 4c8653fa..ce4d28e4 100644 --- a/travis-api.gemspec +++ b/travis-api.gemspec @@ -126,5 +126,6 @@ Gem::Specification.new do |s| s.add_dependency 'sinatra-contrib', '~> 1.3' s.add_dependency 'redcarpet', '~> 2.1' s.add_dependency 'rack-ssl', '~> 1.3' + s.add_dependency 'rack-contrib', '~> 1.1' end