Merge branch 'master' into rkh-track-user-agent

Conflicts:
	Gemfile.lock

.travis.yml

@@ -3,7 +3,7 @@ language: ruby
 env:
   global:
     - RUBY_GC_MALLOC_LIMIT=90000000
-    - RUBY_FREE_MIN=200000
+    - RUBY_GC_HEAP_FREE_SLOTS=200000
 rvm:
   - 2.1.2
 addons:

Gemfile.lock

@@ -7,7 +7,7 @@ GIT
 
 GIT
   remote: git://github.com/getsentry/raven-ruby.git
-  revision: bd026531c390a7fbc71980871a7951bc0f2d737f
+  revision: 84392e5db701f0b5c66802aab9cc82ef9a5ad830
   specs:
     sentry-raven (0.10.1)
       faraday (>= 0.7.6)
@@ -36,7 +36,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-core.git
-  revision: 0f7a43a373cd3a7236ed4b5d3ca4a312a4e4c656
+  revision: b4c4ae9beb6ba8d813491273dc75fa582ee719b0
   specs:
     travis-core (0.0.1)
       actionmailer (~> 3.2.19)
@@ -68,13 +68,13 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-support.git
-  revision: 352419335e9b78cf087dbd8523879498d6177db4
+  revision: 40365216662f639d36fc3a0463c4e189ee1563dd
   specs:
     travis-support (0.0.1)
 
 GIT
   remote: git://github.com/travis-ci/travis-yaml.git
-  revision: e899680992e31b25ddc0aad33d2189a7e588cc1f
+  revision: 2c6ac75077123095e2ee8e8db435342ba2d03c2d
   specs:
     travis-yaml (0.1.0)
 
@@ -136,7 +136,7 @@ GEM
     bunny (0.8.0)
     celluloid (0.12.0)
       timers (>= 1.0.0)
-    chunky_png (1.3.1)
+    chunky_png (1.3.3)
     coder (0.4.0)
     coderay (1.1.0)
     coercible (1.0.0)
@@ -171,7 +171,7 @@ GEM
       activesupport
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.5)
+    ffi (1.9.6)
     foreman (0.64.0)
       dotenv (~> 0.7.0)
       thor (>= 0.13.6)
@@ -227,7 +227,7 @@ GEM
       multi_json (~> 1.0)
       signature (~> 0.1.6)
     rack (1.4.5)
-    rack-attack (4.1.1)
+    rack-attack (4.2.0)
       rack
     rack-protection (1.5.3)
       rack
@@ -268,7 +268,7 @@ GEM
     rspec-mocks (2.99.2)
     s3 (0.3.21)
       proxies (~> 0.2.0)
-    sass (3.4.5)
+    sass (3.4.6)
     sidekiq (2.5.0)
       celluloid (~> 0.12.0)
       compass
@@ -316,7 +316,7 @@ GEM
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.41)
+    tzinfo (0.3.42)
     unicorn (4.8.3)
       kgio (~> 2.6)
       rack
@@ -328,7 +328,7 @@ GEM
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
       equalizer (~> 0.0, >= 0.0.9)
-    yard (0.8.7.4)
+    yard (0.8.7.6)
 
 PLATFORMS
   ruby

spec/unit/api/v2/http/build_spec.rb

@@ -80,7 +80,7 @@ describe 'Travis::Api::V2::Http::Build using Travis::Services::Builds::FindOne'
   let(:data)    { Travis::Api::V2::Http::Build.new(build).data }
 
   it 'queries' do
-    lambda { data }.should issue_queries(6)
+    lambda { data }.should issue_queries(8)
   end
 end
 

spec/unit/api/v2/http/builds_spec.rb

@@ -71,7 +71,7 @@ describe 'Travis::Api::V2::Http::Builds using Travis::Services::Builds::FindAll'
   end
 
   it 'queries' do
-    lambda { data }.should issue_queries(3)
+    lambda { data }.should issue_queries(9)
   end
 end