From 8f345f4ea08edebada0d024d51f5e691c8dad501 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Wed, 27 Aug 2014 14:31:22 +0200
Subject: [PATCH 01/70] Bump travis-core

---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 8def4837..1aa2a7c2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -37,7 +37,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-core.git
-  revision: 335b643a81025ff56a38a3f01b4866cf2e08a385
+  revision: 0c4922f7cbf644ccc97677643bb09f26a919e64c
   specs:
     travis-core (0.0.1)
       actionmailer (~> 3.2.19)
@@ -300,7 +300,7 @@ GEM
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.40)
+    tzinfo (0.3.41)
     unicorn (4.8.3)
       kgio (~> 2.6)
       rack

From 4546d2950829702ece71ae207ce9113ab686d107 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Wed, 27 Aug 2014 15:52:52 +0200
Subject: [PATCH 02/70] Add ability to specify parts in query to get log

---
 lib/travis/api/v2/http/log.rb     | 10 +++++++++-
 spec/integration/v2/jobs_spec.rb  | 10 ++++++++++
 spec/unit/api/v2/http/log_spec.rb | 10 ++++++++++
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/lib/travis/api/v2/http/log.rb b/lib/travis/api/v2/http/log.rb
index 233da85d..b3024cde 100644
--- a/lib/travis/api/v2/http/log.rb
+++ b/lib/travis/api/v2/http/log.rb
@@ -37,7 +37,9 @@ module Travis
             end
 
             def log_parts
-              log.parts.sort_by(&:number).map do |part|
+              parts = log.parts
+              parts = parts.where(number: part_numbers) if part_numbers
+              parts.sort_by(&:number).map do |part|
                 {
                   'id' => part.id,
                   'number' => part.number,
@@ -46,6 +48,12 @@ module Travis
                 }
               end
             end
+
+            def part_numbers
+              if numbers = options[:part_numbers]
+                numbers.is_a?(String) ? numbers.split(',').map(&:to_i) : numbers
+              end
+            end
         end
       end
     end
diff --git a/spec/integration/v2/jobs_spec.rb b/spec/integration/v2/jobs_spec.rb
index 4a30c638..a8a63b7d 100644
--- a/spec/integration/v2/jobs_spec.rb
+++ b/spec/integration/v2/jobs_spec.rb
@@ -51,6 +51,16 @@ describe 'Jobs' do
     end
 
     context 'with chunked log requested' do
+      it 'responds with only selected chunks if part_numbers are requested' do
+        job.log.parts << Log::Part.new(content: 'foo', number: 1, final: false)
+        job.log.parts << Log::Part.new(content: 'bar', number: 2, final: true)
+        job.log.parts << Log::Part.new(content: 'bar', number: 3, final: true)
+
+        headers = { 'HTTP_ACCEPT' => 'application/vnd.travis-ci.2+json; chunked=true' }
+        response = get "/jobs/#{job.id}/log", { part_numbers: '1,3,4' }, headers
+        response.should deliver_json_for(job.log, version: 'v2', params: { chunked: true})
+      end
+
       it 'responds with 406 when log is already aggregated' do
         job.log.update_attributes(aggregated_at: Time.now)
         headers = { 'HTTP_ACCEPT' => 'application/vnd.travis-ci.2+json; chunked=true' }
diff --git a/spec/unit/api/v2/http/log_spec.rb b/spec/unit/api/v2/http/log_spec.rb
index 2f6bcb01..f6a20b69 100644
--- a/spec/unit/api/v2/http/log_spec.rb
+++ b/spec/unit/api/v2/http/log_spec.rb
@@ -29,5 +29,15 @@ describe Travis::Api::V2::Http::Log do
         { 'id' => 2, 'number' => 2, 'content' => 'bar', 'final' => true }
       ]
     end
+
+    describe "with parts numbers specified" do
+      let(:data) { described_class.new(log, part_numbers: "1,3", chunked: true).data }
+      it 'returns only requested parts' do
+        parts = log.parts.find_all { |p| p.number == 1 }
+        log.parts.expects(:where).with(number: [1, 3]).returns(parts)
+
+        data['log']['parts'].should == [{ 'id' => 1, 'number' => 1, 'content' => 'foo', 'final' => false }]
+      end
+    end
   end
 end

From 9b07efa5e9f3e957e6321758cf5b3f8c0b110e0b Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Thu, 28 Aug 2014 17:18:07 +0200
Subject: [PATCH 03/70] Check for user education status on signin/signup

---
 Gemfile                                       |  2 +-
 Gemfile.lock                                  |  3 +-
 lib/travis/api/app/endpoint/authorization.rb  |  5 +++
 .../authorization/user_manager_spec.rb        | 32 ++++++++++++++-----
 4 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/Gemfile b/Gemfile
index 49579f5c..1fa1b345 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ ruby '2.1.2'
 source 'https://rubygems.org'
 gemspec
 
-gem 'travis-core',     github: 'travis-ci/travis-core'
+gem 'travis-core',     github: 'travis-ci/travis-core', branch: 'ps-education-sync'
 gem 'travis-support',  github: 'travis-ci/travis-support'
 gem 'travis-sidekiqs', github: 'travis-ci/travis-sidekiqs', require: nil, ref: 'cde9741'
 gem 'travis-yaml',     github: 'travis-ci/travis-yaml'
diff --git a/Gemfile.lock b/Gemfile.lock
index 1aa2a7c2..97eaff2b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -37,7 +37,8 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-core.git
-  revision: 0c4922f7cbf644ccc97677643bb09f26a919e64c
+  revision: 8f2b4add4581f2897ce14edca26aff99cc60f280
+  branch: ps-education-sync
   specs:
     travis-core (0.0.1)
       actionmailer (~> 3.2.19)
diff --git a/lib/travis/api/app/endpoint/authorization.rb b/lib/travis/api/app/endpoint/authorization.rb
index 94b3f9ad..24fddbcd 100644
--- a/lib/travis/api/app/endpoint/authorization.rb
+++ b/lib/travis/api/app/endpoint/authorization.rb
@@ -216,6 +216,7 @@ class Travis::Api::App
           def info(attributes = {})
             info = data.to_hash.slice('name', 'login', 'gravatar_id')
             info.merge! attributes.stringify_keys
+            info['education'] = education
             info['github_id'] ||= data['id']
             info
           end
@@ -224,6 +225,10 @@ class Travis::Api::App
             user
           end
 
+          def education
+            Travis::Github::Education.new(token.to_s).student?
+          end
+
           def fetch
             retried ||= false
             info   = drop_token ? self.info : self.info(github_oauth_token: token)
diff --git a/spec/unit/endpoint/authorization/user_manager_spec.rb b/spec/unit/endpoint/authorization/user_manager_spec.rb
index 914cca27..5e48ec0b 100644
--- a/spec/unit/endpoint/authorization/user_manager_spec.rb
+++ b/spec/unit/endpoint/authorization/user_manager_spec.rb
@@ -10,32 +10,35 @@ describe Travis::Api::App::Endpoint::Authorization::UserManager do
       }.stringify_keys
     }
 
+    before { manager.stubs(:education).returns(false) }
+
     it 'gets data from github payload' do
       manager.info.should == {
-        name: 'Piotr Sarnacki', login: 'drogus', gravatar_id: '123', github_id: 456
+        name: 'Piotr Sarnacki', login: 'drogus', gravatar_id: '123', github_id: 456, education: false
       }.stringify_keys
     end
 
     it 'allows to overwrite existing keys' do
       manager.info({login: 'piotr.sarnacki', bar: 'baz'}.stringify_keys).should == {
         name: 'Piotr Sarnacki', login: 'piotr.sarnacki', gravatar_id: '123',
-        github_id: 456, bar: 'baz'
+        github_id: 456, bar: 'baz', education: false
       }.stringify_keys
     end
   end
 
   describe '#fetch' do
-   let(:data) {
-      { login: 'drogus', id: 456 }.stringify_keys
-    }
+    let(:data) {
+       { login: 'drogus', id: 456 }.stringify_keys
+     }
 
     it 'drops the token when drop_token is set to true' do
       user = stub('user', login: 'drogus', github_id: 456)
       User.expects(:find_by_github_id).with(456).returns(user)
 
       manager = described_class.new(data, 'abc123', true)
+      manager.stubs(:education).returns(false)
 
-      attributes = { login: 'drogus', github_id: 456 }.stringify_keys
+      attributes = { login: 'drogus', github_id: 456, education: false }.stringify_keys
 
       user.expects(:update_attributes).with(attributes)
 
@@ -46,8 +49,9 @@ describe Travis::Api::App::Endpoint::Authorization::UserManager do
       it 'updates user data' do
         user = stub('user', login: 'drogus', github_id: 456)
         User.expects(:find_by_github_id).with(456).returns(user)
-        attributes = { login: 'drogus', github_id: 456, github_oauth_token: 'abc123' }.stringify_keys
+        attributes = { login: 'drogus', github_id: 456, github_oauth_token: 'abc123', education: false }.stringify_keys
         user.expects(:update_attributes).with(attributes)
+        manager.stubs(:education).returns(false)
 
         manager.fetch.should == user
       end
@@ -57,11 +61,23 @@ describe Travis::Api::App::Endpoint::Authorization::UserManager do
       it 'creates new user' do
         user = stub('user', login: 'drogus', github_id: 456)
         User.expects(:find_by_github_id).with(456).returns(nil)
-        attributes = { login: 'drogus', github_id: 456, github_oauth_token: 'abc123' }.stringify_keys
+        attributes = { login: 'drogus', github_id: 456, github_oauth_token: 'abc123', education: false }.stringify_keys
         User.expects(:create!).with(attributes).returns(user)
+        manager.stubs(:education).returns(false)
 
         manager.fetch.should == user
       end
     end
   end
+
+  describe '#education' do
+    let(:data) { {} }
+    it 'runs students check with token' do
+      education = stub(:education)
+      education.expects(:student?).returns(true)
+      Travis::Github::Education.expects(:new).with('abc123').returns(education)
+
+      manager.education.should be_truthy
+    end
+  end
 end

From 023b5fdca090e6a1bd3880b99a4592651319d970 Mon Sep 17 00:00:00 2001
From: Dan Rice <dan@zoombody.com>
Date: Fri, 29 Aug 2014 15:46:16 -0400
Subject: [PATCH 04/70] Update badges to latest shields.io spec

---
 public/images/result/canceled.png | Bin 2043 -> 1369 bytes
 public/images/result/canceled.svg |   2 +-
 public/images/result/error.png    | Bin 932 -> 1131 bytes
 public/images/result/error.svg    |   2 +-
 public/images/result/failing.png  | Bin 1247 -> 1293 bytes
 public/images/result/failing.svg  |   2 +-
 public/images/result/passing.png  | Bin 1461 -> 1487 bytes
 public/images/result/passing.svg  |   2 +-
 public/images/result/pending.png  | Bin 1494 -> 1462 bytes
 public/images/result/pending.svg  |   2 +-
 public/images/result/unknown.png  | Bin 1131 -> 1346 bytes
 public/images/result/unknown.svg  |   2 +-
 12 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/public/images/result/canceled.png b/public/images/result/canceled.png
index 8cbddb0f9858488ae5d3eee6de2f5834f6dbe19d..7a7f1d54a4a7c76269fe0f722434cb63e9bc4a5c 100644
GIT binary patch
delta 1362
zcmV-Y1+Dt~57`PKiBL{Q4GJ0x0000DNk~Le0001C0000I2nGNE086m2%#k4)e+v@;
z01FcV0GgZ_000F0Nkl<ZScUDG&ubHD7{@>JCT2S^F-B4kO|&5XUL-3@SsFwPLT+kU
z(6+Q-m2G52!3M1VK~Ek`>0vKgr9lg+cP}=Fh1$JX>_sUaL@TC0s3bH~l1bh@NQO-F
zt1D|GyZeQQyz_pa=R4oYGw(YSf1&_fy?Qlp@ZiA_kH_<)&1SRFWbE6wuh|y9DGG%G
z%gf8@`T6<ZhK7dXN>5MEPfn-v4<W?%W}7P^5C}Be!j>SP&&!2{g<q_|u%>C>O#=XQ
zU2nF9ErFsairsGi-3pwNQa0O<3B_Wu*%r184u_*v2qCshDXA8Z9zCi$fB$!)o<=RM
zSS)^*(cj<ykJkwyur^u+U$aWa$H(dI?cJ0{HST*}31922Ufnlo!kIH?XlrZRl*a!}
z0Ba-BOP4MY3WfOa;RCT)jK#%803JVnOm}y;kym~^H8o}8O6S<Udp9?4-o)qg@$A{N
zn&zrKm>muW!C;WKwl*vle+#3dqXu{V`gH)(=`_h?lK1c58}l<WGaNsDoLnwPGMVJv
zyLWZ<R8=Jy4C3{ANvG3HO-+$Xr7FDD%iFPI2cb|1x7*F!++59TDnZoS%K+Ba)(D5g
z%*@Qt+uLj6Hs&@O_x1HLJv~i09A<rey+WfDg+ies0)YT;-@fJ6f2~_YA`uf8iA1<|
z?HUgrJRlGV81n#{rZF@$#Kgn|ot>Qx^#XwaFJ8PL8jX@jBshKgv`KF>d7Yh|%+Aho
z`}S=znT)BfT3AcswU9_8P*s)5$w?kQd`Nlz#@bq3X?*0!5r&6{QB{?Ri3u)VyjY=8
zO&7rH^%9TAX>V^we+XgZw70j@)6;|7?Z#rU7)>nU`Sa)ad_EQy7I3@W23JdO&z?OT
zI&_Gxt}fuqc3JIO>g9R8UdG4A@%eltlS!jNwa{=oYH4Xf(==371u)&+rO(oj>~gJY
zV<}}#y>e7DETv@U&Yk4*c@uy3>{;URIImv4LI}a==%|Tze>$B=DN$7wMNtf{mY$T7
zXf(>_&z}KM6otcw4_A1rmnWsf<#M6xIxd&1<~5Zd>Maw1bLY-sv)Q<C;Q}vTzBIUx
zA3xI3(ZRND+c<yzym6w9%eH(xJ3DLAE9c5X*Y%2c{rWW>9UTCsc_9Qgn~nYZ_jCF3
zWfNc0*LB_Sf6_>AZf=hL{(k&^KPOI{U~q8Iq_>&8H*el>^5jW`5LM5yF&Z|ZSS&I&
zHpa1I#~2wIF}Qp8?s4VH74F}^Pd1y~R1;#c7=FK>v9U4Jm$aECBoYZc9uI?qgWS1u
z$C!We<Oy9}T|^=gmX?+(nozD$eq2lM>C>lZn#RDue*oRx-AqqUSFNv?H#s@U-o1Od
zapMM>rZsGW5(<TCzCSK4En&CY(KHRK)r!;U#A2}kkjv%BWHLx8vD@vet*z18+G^BQ
z8y5-%GMNmzuA{0d*=*L}%2B#|%AxBzsZ<J0(~wef;J^Xk%Nx=1@-m8|;BvWGSy?f-
z`T2Qcf4uRymR_+~WN~qkY&MG!0*}Xo!{Ml?ua}q4=lS&M6S-Utm&?WK>Z-}dMkv8x
za2@!eW=0cGtqK2DNGY)jA^yzea;KVYrX2ZvzS$PG3{uJ!tJCR>rc$Y-l+xa8LnV~<
z(f<IX-ERL?0SJe~Kc`ZuST>vWODUWFr_Rx%C`X%Z;hUqSrDb*3u3ZCn@7_)P1<I#$
UPeQX=KmY&$07*qoM6N<$f`W&kw*UYD

delta 2041
zcmV<V2L|}r3i}TsiBL{Q4GJ0x0000DNk~Le0001D0000I2nGNE0HB8p&ygV-e+}0F
z01ejxLMWSf0000PbVXQnQ*UN;cVTj60C#tHE@^ISb7Ns}WiD@WXPfRk8UO$Xcu7P-
zR9J=8nB7a1ZyLux&&$j_lar2)I=(fgX0cMb<YIwubzm<<OC-x4NP=!8QWUg*Ky@H{
zAa=4Wgh4@_bY>m(YD+{BVhB=%e<D$2<4Zb@Gmi6&^StcAZ|7k~$I9RG)8BsKX70D^
zy1(~zUH5g(i~!Kv+k3#}a{WtDlt0L_yp1hJd3pI(Q~1phkH^hmFc_Sioc!B`3l|22
zuCA^cQ50VS+qarr0`>LvTTNlpplO=v_xt}WN2Aey@H=t>fTn3%O<^-3e<+G_Q#4Jp
z$uvz?H-M(5rZw|FY5<Lmjn=rSsR<zM-p0npv}=Z8{4QH=ZZ26_SsRusDJj8jx39aN
znVIPoP1DRsXCzS+X>V`eup<OP;MlQa*0{aB9YGM%?mctn45BFh-#DVUxEPPevthZa
zswx}~$GYo)Ag*Un!!WFVe|B~@4u>Np>YYw!+Oei-T)cQOWi45+!{NZ~c3W%7=lqN#
z1VJDpBg2wSG(}O?M4ccAh@yyL7&x6y1VLD%PnKni`|5c`QBvkqRYg_RlsUWIo;KPO
zJPpGj9*?uKvhv+~$q9q3Mk2bqySvHG&ZelSh=G9to;`a;c6K&bf395N(xpq56Ruys
zPFGhKvMh7&-aR@xI#P6*rb$an3#U$<!teJJ2n15rlJVatS%dxi_fu6>MIaEs>2&hs
z$rGZ{D6OrnEH5u3NfL%(@bKY7;_*0p_UvKj&Yjq7HUPG7-_C;v4_I1SLXsp79XdpA
zZZ6?)7`xrh{rmS3e?^hz=4Lz|52~sn%QBB1JwjF0lt57wg_f2U%h{1ggu%f<D-|6+
ze3*rW1ps7OPLBSxkk?xj1Oc1P#><y485|tM?RInP)-8sHhR`%EMX|2y)>zkdi)^xC
zGcz+eefl(=ot-Q$F4EG{LPJACT7v0{bxBDHWo2bty?WI$e~8cLLy{zVdU~vv)!N!h
zMMVYg-n}Cn4&!pU=<Dl4RaK53KTbtO1#jQJrMkKrRaLom?HZCKAxRQGpO3wJ_oAvQ
zJv}{$qDWIy6E!t8yn6M@x|gPD)YjHAIy%bJr%y3WleV@t%FD|c8ylmcp@IJXekLa;
zDJ(4H^5x5xf84r`_}+^!O_Sl_VLToWx~?-eHipmV<MZdw)}Ga$tLGAZpU=nG*cgH!
z;PH4E8X8JTOUXzV9A2-N;o)IQN=mG{lGuCl<VniP%8(=pS(f?q>64{<e0-ez{Cq@F
zBp3`@Io|8_^5Vq{%F4>D8fF*<`T6<S?RGjlI{}a+f5}QQ$uFX?un<uct(Tujmx`hw
z2m-NKjMCClR8?hWW@b%ru5rYAUP@e4mSxM6i38&CID#Np^P(sMzeI9EE?KXpX~beN
z>%y9*A<MF*L)Z0`v(s@>RW&6SCs0vQfzRjT#*G^+EiKX9+)PnXk;NrB_a|zErfF!J
zhSTXJe;5p|Is4<sk4#KV0KdF;RaH}JVnX-Zw{NW!8;{4)G>xpRECB3w`<i=x??s3|
zDvWh?br^<$+wG>ZvXY632^JO>aJgK#TrLd5ptiOaAjL?l`x6rrR905vcDpeQg98T+
zq%EF_^tQT<kB_r&-##QsvQnXGn%HbMCMPG!f6UCJw6v7k+FDCTVoyRx@_1})jOyxY
zYj48nA3l6w_wL;+FE0}ghgn`;Mp2YC>G%En_w3rWi*PthI2<Mxi{WrM2!%q#<8cZK
z3ea_(oSYo;^YhoeSE9+QqcIurc$}J=8jc(}LUD01{r&wcE-oU9BDZhfrmwG$>FH_4
zf5*qIizKkRzqq)_&6_vr?d|33*RRaX%n*ykEFwR85nsN1;mw;jbaZquKR=J6C=3h?
zFfua2xpU_zEiJ`nv*Gvqt*A{HKA|sp{QC84ii?Zs=;$C63SqO^xO?|5BO@bty<X0r
zKTjYKz~yo=Iy%bG&`?T^c>MS=ZEbCIe|L8iiA2cA$l&?&=S)mYaOch)&YnHX!omWY
zrZF`&^}`w=oH%hJZILidlW*U?p(qL&85ve;aXOs<EH5u3iXx&Y5{t!9Rh7KFJWSJM
zZf=geygUGAXJ^UJ&j%nHjapw}BasNPSd84<Tm(T#Is4$jgK5dm&CL;wM)7z&e*^*n
zyk0MYAmI1=$;rtf5C|a4GLj_W^?C^ggT!Jnyk0K=p-_lOBtl_fA*N|EH8q7KNo?D;
zjbJdyjvYHNO_SN#S>o|H9*>8Gg#{EvAtxt?+1XiaHXGU5+332?^z<~cEaP&yn4g~~
zCnpD&%S9v-VQy{?x7$r96hhZ^e+mi;P!wf-M;twRG<~&R<rH9z!PcAqHM){fS6BC4
zd0p3$WjSR&k&icu<lhae&q>blzee6L3?xbVDIT(}>rueD;T!yh_?iEj((U<Q{-a7K
zD+t1xw7C)apXFqlrYUQhHe?t^^G}_&NmyA~*=h=#3SHM{WlhumuIu^>PatEf2_+DX
zMz@;6X2LX0^REIxeSQ6(R8{?_VHkfj3}gL@vPr0_s@iG_n*q~qw+9>!$6xyU`~UqP
XYwSiex+zkX00000NkvXXu0mjfsMpjw

diff --git a/public/images/result/canceled.svg b/public/images/result/canceled.svg
index 902223ca..606c1fc2 100644
--- a/public/images/result/canceled.svg
+++ b/public/images/result/canceled.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="98" height="18"><linearGradient id="a" x2="0" y2="100%"><stop offset="0" stop-color="#fff" stop-opacity=".7"/><stop offset=".1" stop-color="#aaa" stop-opacity=".1"/><stop offset=".9" stop-opacity=".3"/><stop offset="1" stop-opacity=".5"/></linearGradient><rect rx="4" width="98" height="18" fill="#555"/><rect rx="4" x="37" width="61" height="18" fill="#9f9f9f"/><path fill="#9f9f9f" d="M37 0h4v18h-4z"/><rect rx="4" width="98" height="18" fill="url(#a)"/><g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11"><text x="19.5" y="13" fill="#010101" fill-opacity=".3">build</text><text x="19.5" y="12">build</text><text x="66.5" y="13" fill="#010101" fill-opacity=".3">canceled</text><text x="66.5" y="12">canceled</text></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="97" height="18"><linearGradient id="a" x2="0" y2="100%"><stop offset="0" stop-color="#fff" stop-opacity=".7"/><stop offset=".1" stop-color="#aaa" stop-opacity=".1"/><stop offset=".9" stop-opacity=".3"/><stop offset="1" stop-opacity=".5"/></linearGradient><rect rx="4" width="97" height="18" fill="#555"/><rect rx="4" x="37" width="60" height="18" fill="#9f9f9f"/><path fill="#9f9f9f" d="M37 0h4v18h-4z"/><rect rx="4" width="97" height="18" fill="url(#a)"/><g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11"><text x="19.5" y="14" fill="#010101" fill-opacity=".3">build</text><text x="19.5" y="13">build</text><text x="66" y="14" fill="#010101" fill-opacity=".3">canceled</text><text x="66" y="13">canceled</text></g></svg>
\ No newline at end of file
diff --git a/public/images/result/error.png b/public/images/result/error.png
index 5e8f4b4c51a1b873fc2d036191d78ae4b08e6384..457d4fe5661c596adac847cc22ae3eb035d0c241 100644
GIT binary patch
literal 1131
zcmV-x1eE)UP)<h;3K|Lk000e1NJLTq002w?000sQ1^@s6@e??#00004b3#c}2nYxW
zd<bNS00009a7bBm000XU000XU0RWnu7ytkS4M{{nR9J=8SkFs3X&ioLGS`_Lgz!gb
zU4njmTf(4{CHWFb;H{E{%CJMlw_u|VN%#*0ojPQ6*h^TrM4>^)4&fdIYcB;ILcCTm
z*0Pc4h>pH{SRDK@X1lOE?E@ct{XEb6%;Sf5Mw9}8rKKf%cX#)mUa$XNtyZg{FgiOs
zm5v~xP$=N#<>f7rNc`mU`F^41=H>=Cj*HSX-J*2366|)n(h+Kq&*#bG<KvGi0Na8f
ze41eafGCPeN2mcsQ54IvKdS(IC4?xQrvk-dQRxV>&}y{?nx^R%LI~vQ=;%nc|99#=
zk9u6OSp1Yl(==3#PS-y<eZgQ59*^fk9&+4gJz)U;oq>&wjlpa-f5_v1H?T(GW@cvK
zbUN|y@BqKxk7P0l060EAhTH9ybmi|Okw^tsx`xqc#QOR=+S}W4adA<>l|$~K&oB%e
z4hJk23*O$|5Q#*<^E?1xb#)cdXcPkj1JG)<*x%om?QtB3@$qpO3<e~VNnBoDB9%(j
z^^gPo-aQKd>2w+{mkZa|*YJ2e6<oEp(RzM<9<f*qE|&}0Y_`UuRE0vJrtEe*uCA`&
z^?DHsg)llgDsiQOZf$L0Wo4yq&u+Kl{{9|5pAYeP93vwm?|R6UswA$5P$&e3VGs_7
zad>!$a((sQdR%G!<;xdrZ*PNP7@VA(V0wDG#zW2*06IE4(9_d{+1XhDf8EOEy7TjM
z==FM-OeU#c-7}lb2nK_&SS*M}quAWsZ0J#qhPR|fqk$j@U>F7fDo#!5we;hl+)Hjv
z2&wDWXkdg8c)eb{zP<tgD2hUFZ?D9+w6xUht?m&*pwsCfiXwD6UCq$tJgPz0J9?!}
z6B83qtJRpAn!?S^jl?}YJ;7$Pp}DyklarIug-ZM6*0;B}6@KMhd5NM}Q+IcFSXfwq
z)oR7y;2<_OHYBbzjB>qPFOf)KXlMvDO=Ea?81Z=gUA<g299XefL?94Ae}6yr_Vy%h
zcXt<yi;FloI6x+o`Ov`pem|^MD*}Ol6!N13J3BjrAP87qUWVK4Ml2Sq_^{P_x!&pN
zDcaiFu(q}aqtS?PIQ*_&t|+I|S@%2t`S}?v%R&$Ys8lL&9EYZ+CICP#mqRL*0wDw}
z%Oagl!(cE-`{dSzLIJ5%3Zf{2VHjjG8Hp>0&1S3V6^lhAlSyPU8PGHhy<QKkRto?~
zBogTA>Z;Jo^+Ztw&-2J;v(RWXFquqHsZ@3Ka-bXzM;5?$4VC{P<OcQ`KnQ_~rs>~u
zx!hN!!;~YR&nq247KD)BRUF58d7l535W*@Qs02X}l#U<=!m{i)3IJR#*AG0;`!ku0
xl@Ox%ABcT@eM(2DfJUSFqqVhld1q%Q^d|~hMkc<0FaiJo002ovPDHLkV1kn<2bcf=

literal 932
zcmV;V16%xwP)<h;3K|Lk000e1NJLTq002P%000sQ1^@s61nsjN0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#MoC0LRCwC#Sj#JXaTGr@T`7+mkIAc;
zkVjcg6pLAS>}1Gt8Y%e`tXSB2tZb$%B$Dz73oG(UStuJ3k|ZNZDet%W&F53!+nvjZ
z)s>%9r~5sR@A=;I`JVIr-Wl8Y__#wvX2R?d3#g=|L@cD0FnhJ>>1oRV0Nvc&SP261
zp3y>~kjKimczt~pi^-$Cy}ikQ4ubrF5GFf7Ff$ITj*brb$QF$!CMNi-tE(fM?Uj|4
z(%RbkP7e^QW}FG{ka>D~lIQ1V`N$TH%FD|oJw06>A0H{3=OQL-X8n(C2fS!TMurRz
z4@*Kqf*c$iNKa1>ZT<cI;`MqtuBoY!{QP_g1Ol?Qwnn{55^)<E8pQASQ{La-m%Y6`
zF|TI^p|P=1a&mGwo}ZtW&CN~f0AN8ufvm2s(w3H%M)~OIh<>%TwbX&&v%bDArKP12
zev^}vUvCE_l9-q%O-)TwR#wIU)z#JV^75i52v)nR5>s=*xw*MgUth1sI6gk6{<C&)
zyWL{5*`&F-S=!p#xMoaDj66I%a4z(-v$MQbQ&Ljs)7#rC6%`c(8TQW3PR4OMo$vgj
zwnMZ^*xA{UySqCE+t}EUqN1XRWI^%q@p@uL5J0i9v5awccBaQDEG+!A5-=w_J6i?^
z2X!5iK+L(hIqs-hXL)&<RhpEP#P~}~OSA*9!^1=B&3@5Z&#rdP%*DmUl9`#wG0N)d
z>PoJ!uQ@3%FOPbU#}m>2#(uxNykv~5tSmi-@-eb;M*tWS@cDe?uC6ZG+S;NY09SsH
z0hrxxr@Xzr&E3ZsAi7*Gwy@dnTa^G^Fc_4+zCNOeUheMhrhaN_ih9uQ?rub77%Ktg
zIW#mR0|Nt;5d*+{RtbxXiv)gTWJHfKIy$PyR=#QtB`+*2NJ~qLw70iY9vd4YpxCUh
z9KN>j;THPncDTL0)lt_pO&ksf`xVuIlH;iw)`M|=oS&bwEYU)sxVSiu5y$LnB%BvU
zIz2trD-OGlN;)|?VL2lv=;Gpn&*bD}K5>&_o_ep;)KuEceo;ZFs;UZEc|EB%vGj`k
z&bPqdXY(%yVa3Xy(mw!%74821-fQKbD!4JM{!`_j00RJ-YA-D+l?6Hg0000<MNUMn
GLSTY`2gC#b

diff --git a/public/images/result/error.svg b/public/images/result/error.svg
index 23398305..b3f6121d 100644
--- a/public/images/result/error.svg
+++ b/public/images/result/error.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="76" height="18"><linearGradient id="a" x2="0" y2="100%"><stop offset="0" stop-color="#fff" stop-opacity=".7"/><stop offset=".1" stop-color="#aaa" stop-opacity=".1"/><stop offset=".9" stop-opacity=".3"/><stop offset="1" stop-opacity=".5"/></linearGradient><rect rx="4" width="76" height="18" fill="#555"/><rect rx="4" x="37" width="39" height="18" fill="#9f9f9f"/><path fill="#9f9f9f" d="M37 0h4v18h-4z"/><rect rx="4" width="76" height="18" fill="url(#a)"/><g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11"><text x="19.5" y="13" fill="#010101" fill-opacity=".3">build</text><text x="19.5" y="12">build</text><text x="55.5" y="13" fill="#010101" fill-opacity=".3">error</text><text x="55.5" y="12">error</text></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="76" height="18"><linearGradient id="a" x2="0" y2="100%"><stop offset="0" stop-color="#fff" stop-opacity=".7"/><stop offset=".1" stop-color="#aaa" stop-opacity=".1"/><stop offset=".9" stop-opacity=".3"/><stop offset="1" stop-opacity=".5"/></linearGradient><rect rx="4" width="76" height="18" fill="#555"/><rect rx="4" x="37" width="39" height="18" fill="#9f9f9f"/><path fill="#9f9f9f" d="M37 0h4v18h-4z"/><rect rx="4" width="76" height="18" fill="url(#a)"/><g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11"><text x="19.5" y="14" fill="#010101" fill-opacity=".3">build</text><text x="19.5" y="13">build</text><text x="55.5" y="14" fill="#010101" fill-opacity=".3">error</text><text x="55.5" y="13">error</text></g></svg>
\ No newline at end of file
diff --git a/public/images/result/failing.png b/public/images/result/failing.png
index ed9087edd499a8ea344dc1e5f214f2e6d096ca54..d2072b899f66d89eb71e64e3819bc1370c452a99 100644
GIT binary patch
literal 1293
zcmV+o1@iidP)<h;3K|Lk000e1NJLTq002<{000sQ1^@s6BSSLu00004b3#c}2nYxW
zd<bNS00009a7bBm000XU000XU0RWnu7ytkSuSrBfR9J=0n0;tdXB5VN_vWKXYTTrW
zwbc2KQWiVc7PX2_X1fpfMKx53E4mG(GKSl5{xv}uK@c}9v!ysUmv!yR)>$bktPD3C
zOe`6Qof~5l*<h1Gtj=kg+?d{b-~A!I=B77kI-K#qL(e(SdCz_F^o4LE0c_p6b!Amm
zRfo^#t9Ck_PKq22wp6ht<PB9*`Fr&0&5OVN^4iA3pZ7{FEiJWPulI~B%caE@HxX|-
zZx&lZL2*k6ap51O*$(Vg6y?4#5I|DLiY=j_aDh}Ii^Fzcl@OxXdQ73;XL|C5PZoYz
zmgQ0*1Xk$o?zZet2l;m7;xxe|cxsn3|J?`=e{|fE&xPsEPZxGcLe6IZ@Slw9>FFtG
zM=nmYfPcd)4DQ)Q=hMq9`Ak$FId0^DW&dvCe=)J4q2aEZ=<=8Iz?DB)F?aTqAFBPS
zJ4R=knAyLpChEFQE&zl=AtI3o;cytA&u4JGy}hQ{%=+}{)21C0xzFb#91atSL<ogK
zCN2}IW=37)B$6cac+Vhpk&~u=-Nz?bxbFz1fm);g#;K^01D5@|$Vq0u5aQ9!FR0%C
z38jxLHaJ^ZIaRw4P;=-gbDCc^J<|$PnwUr=2nK^hqfs_(+GJ@?cAYEVym>Q2Lqi0E
zK~kwyZWFW6*0=<Kw#Fs2H7+sr4?MYyulBt|WlO8k2MWq>s2U$^c#dy7+o*i;&iTrg
zR(>5i!=d%ha9v56&RId$G>u#U=<n~x?RInQ*f9cufQieVohlCm0t^fc;C8#|>+74e
zV*=y4Zo<-vG60rVl(Dp;jB#COMs+Q(etMK0U!Nto{}7&vxyC$DP=4XdZWhig;nt5)
zJaZ}x&RbQ@r4xND^g8*u|1;A$E7&J)ORjLaTqufy+wC@PPWIo4mz>O9R=E%&=f2F)
za%jrzFKB&>Z{FX_#pqeE+1WXG#>5wr&$de-1T!5rBuO?n0hD`65K0oi$CXzTF!fDr
zYHGsibh2*UI?kUzZ*U_cBh=T|<8U}wyLRpE2TgGkhlhtv`!cyqq}9m)%(cTwshXyy
zyo~1UJ4}3``M9Q&RyD@6xXV8cQ~7K&x}$`Lo?k!d+1Z%VL|xbE>gr<AqD6FcbQs*h
zg9q8NWebr=gk&;VkcsW>?bOuN(ACw2s;W6nR4o9Q>Qf!>vGVObJl5XL=+&zxe!6*f
z{e9<tX4TfS`on%wHV0`XX{l)f(wa4Ea=spnj*jB-cu*7tyWNi0>&0fX-Tu#{)5PO(
zgb;W<9ukQJe!t&1XO(N3Mm!!zRaM+>H_2qu;4)*IGd`(zE_R*8<+F_XS}M)ucoGQ-
zzo&$eF~#6BXA8-*>sy+}?>7>ROE#Wpd5L)|R&#Fm>$z+~YHVyw0VO#niV&^N;=em@
z9E>7#oojzwVj#Q=@0GtS=QJejvMm3QPN!GhV~u$uEvv<rz|Oh_0J!Wn=FM=Ew%aV{
zQV!QOyVvX88H>ff6GC|IrO13S#(1$MFn{J9J2YKqEIs+#S(jvCf3UPw0tg0!%VV)v
zdor1<5keIGN7*KaQfvwNLy~a1J=bTI`L=BzIMx3zP6fISwma>K00000NkvXXu0mjf
Dy3%mP

literal 1247
zcmV<51R(o~P)<h;3K|Lk000e1NJLTq002e+000sQ1^@s6<}s*c0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$fk{L`RCwC#SZz#ORTzF+uIuOrRupW@
zGzvt<s3b<#0w#6|g)AmYAxxttpcx}(KQzw7nJ977KPxjDGJ_)y7l_8C7|Q&iEIJX5
zEMZ}Z+YkuBj1`=W;h+^L?QQElFYER8wp}!lv_E{Cr{|pKoco@0o}TyZy;tFKx%2?~
z1=x@R+oSX%&1^`3gLAvxDHDa+PHrLHgkf6rbCF2ImdaJ|;V{zBY+N|S3kxbD=_m|R
zE)1Wh!YG+Aa+u9#w6?Y)QC~9j_V!X)TU$$z_g7U_p{1oIj^`t>Fg72+!>0zZqwCAK
zK88&5BY5D=_o&WF)|PVr6<CgmQ!5Y%AQ%iHQC~8vtgM8=V8HtNI<@83GM}tZ&IiM>
z?R)G`;>6Rtv2tw=6^6Uw=9wNjhaUz9Vb0dU7v!<D&SUZC^CGvYp~Mz%G#b&<(*vzm
zi|OfUw6(QSUuS1091aK7YiepxSXhXTjt&eD4-+5VIP+UyUysJdMruz@O<{6!67u<^
zp;X#-g34ys0H%*0g@67x6utHiIIWKA7hiA2Hggfm>z>Eh;a9<?3JYJ`9xWHSlD9uV
zhDHZ%K@s_y`SdvE+@Imj(lY9k+J*hkkl%kCN^EmFoeoV+O|V+6n3<VDb#*m(o)<UG
z5IqIa%|@?f$j{G5U0t2%!{hM~9~Vl(iHYLmi+jk=k%}F-;C5kg@eiDQp@G`hJu}F%
z?t(YK(@A0D*(W53Bjs3mW$Y4NbL!>2Fgl(iKKH3-G2lEz{KR)>@O{VoxH0RAnO};e
z!i<lPV|8^EIXO8P9UX;ArHT=NL8H-#o0SX0#xo!D^YfyQgu+PTx+Ggmek}Luad+k&
zFg;#{eP5ix8|Qw({bd#K1%ko}5$0eg?N-U!a?bPPH{>JRw}>s;EaESp{TjOu9wJ|+
z?Il>fJPJ;Uq&Y?z-H05;#l<k0OjNg6Ebw~0@cDeS@PdK@;%zotOg@q3kLBfM@{yO9
zC;Etvk%HwIDWZ9Y%Qc~}p%G5I1&6KMadXatkg#o@uG<*HO4gQhYA%E7N~Kctmnm>R
z^?XdeK5D3e|H@R{+)^aWF^rp?oke?lJLMRb8=Ouj@qK-L#50?im=MQHPfRqYba!{7
ztE-FJ%m)+eb~)zno4yEcc&_5tkzpMCc7(X!C&s{ZW1+)BNE%8cxQt_U+!C7AIZYPI
z8~5Qc0nDxr^yAWpN0KIAg^)laiT;&VR#p%Sg=nK3$3d^xL!nU6sqy>$8<|_+8CX7A
zSXiKtVd2M2tyWW=`H_#6+Ww52G41o$m#{Nezai$*pOinypYV(4W~!jdP~zIEA4PgC
z^&8b&sb9`zZQ-yU3ghCU7rRPJVE@F8x5^%(vDta|;lSy$IQ@hrxiEISJ*9V8FL6to
zJ_i%X^6oJdS}R3v;Mh^DeC101cl~efRW{|3AiVkWD}|H(`73*c<jsqmNwXCOwd(&z
zf(Lc#gt_c?!VIPIwF9q6%ctuhZf$MNk;)fU3tS*AUsU}izyM0W&Vi<1QvCn`002ov
JPDHLkV1j4AX5Rn+

diff --git a/public/images/result/failing.svg b/public/images/result/failing.svg
index 19823883..a4aec14f 100644
--- a/public/images/result/failing.svg
+++ b/public/images/result/failing.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="81" height="18"><linearGradient id="a" x2="0" y2="100%"><stop offset="0" stop-color="#fff" stop-opacity=".7"/><stop offset=".1" stop-color="#aaa" stop-opacity=".1"/><stop offset=".9" stop-opacity=".3"/><stop offset="1" stop-opacity=".5"/></linearGradient><rect rx="4" width="81" height="18" fill="#555"/><rect rx="4" x="37" width="44" height="18" fill="#e05d44"/><path fill="#e05d44" d="M37 0h4v18h-4z"/><rect rx="4" width="81" height="18" fill="url(#a)"/><g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11"><text x="19.5" y="13" fill="#010101" fill-opacity=".3">build</text><text x="19.5" y="12">build</text><text x="58" y="13" fill="#010101" fill-opacity=".3">failing</text><text x="58" y="12">failing</text></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="81" height="18"><linearGradient id="a" x2="0" y2="100%"><stop offset="0" stop-color="#fff" stop-opacity=".7"/><stop offset=".1" stop-color="#aaa" stop-opacity=".1"/><stop offset=".9" stop-opacity=".3"/><stop offset="1" stop-opacity=".5"/></linearGradient><rect rx="4" width="81" height="18" fill="#555"/><rect rx="4" x="37" width="44" height="18" fill="#e05d44"/><path fill="#e05d44" d="M37 0h4v18h-4z"/><rect rx="4" width="81" height="18" fill="url(#a)"/><g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11"><text x="19.5" y="14" fill="#010101" fill-opacity=".3">build</text><text x="19.5" y="13">build</text><text x="58" y="14" fill="#010101" fill-opacity=".3">failing</text><text x="58" y="13">failing</text></g></svg>
\ No newline at end of file
diff --git a/public/images/result/passing.png b/public/images/result/passing.png
index 2d1cc7585852b43772600a95647870ac3bca1e49..bfb38ee946d034a8f13fef3c35016b0a670ae00b 100644
GIT binary patch
delta 1484
zcmV;-1vC1!3(pHNiBL{Q4GJ0x0000DNk~Le000150000I2nGNE0NbO<0{{R31am@3
zR0s$N2z&@+h>;-|e+6+#L_t(oh25BcOw?r@$6w#?9rp`wCLB@ZG!k^o5K9M|n20r;
zZs5(5jWnl*WGgqdx#q9xFxg6JKxuAvG7NuAl+2a3bZVIlr=q3KF?DJi3qf7t-NEtw
zexLq8PQJj&rEKT=Z13&!Jg?_@-)Emadv@PP0$8wM!Gz(%e}|Vj9FCDDlgUJwqc!bX
zxJ!8KP*jEH=9_mfUao&{$GpRpQeIx(XuI8hT$bg?a2MAZcjulAcM1I#!jJG>l4lx$
zBA?Iq#55V;9=F3?LjQ#cNjR*Vjle`9M7Yb*g;2v?LH~w`YK@U)S&kG!(3>hMDtev&
zFM60qFoq`mf3GANKz>-0fJbWXwr$%&@(9Y*@M>TBm45d$_H}JM%C$0i@?_%T;zIK1
zjfMN_NL%*|Pmi<ptEa4K8o>mRo12T<?Z)MD;cz$ttg^CFx3=r}$dMyDkIvlTaNu&e
zaJ${)=H}{{PKwZJf96%@#xH00r1NYT^F1*UgM08Fe=@JIW&ANl4@?itkBiRYtJH(+
z&A7z3<A3Az*jXX5+7*B6ymN=V&(2rRvGtV`jCm>}z+z29C?30y-ILBUH-0($Gq3ij
zy;FTQ+T-!ybULZ6t!4J?*}XQf`#4xWXU-gIYHDygowT;L25+<~bOP|+X=7^fC~7Vp
zB|mYse~yp+G?p}19G_G#CO>gaV198@5k>o#GqLCe-r1T>f;lB52Iz9NMP^!Y3L6fr
z*8O&V!WxcWJj~SMQMCTkuG`mLvZ|^C6F^l}6;`X2J$v?$l$4}n-PiV&CnY6OU0sdU
zYGv21T|GQHr74<D0Nc-P!j$M|$Hk2#4@wQNf6;>`uzSfdPOQ4Yro3tf+v5Xl-|6iv
z%PM5mTSX)#k6`VAr6DmumsgxB!8}}{_TJAtJ78#ljT|(VT^GN>l<4QXy03Nnx~tC<
zZLwGoLSV62f}Ucd(HPQ+?(_-f7wqZ)utdon`=VroAi$Q6T2I-*&qyzfC%rHpSuzCJ
zf5uZTKHNEv%h&6fGh!))Gd70AIvVyMm!cJf5Evo_vLruX0?g45>gu|$$JNo-iO$Z>
z#$+-vW5x{X>goclp`n4))KnrOBFM?f3F$<iJ$qK?7wkl<?V3&iGZPkK7B=2YT*T>X
zH34SAjNj%V`o&0=%v#yud7rJAzMcVbe`fYxD5v<RHH>v+gv7dfbe>YRT|-s$?CkZE
z%p8`FS=e|Zp+LvFtItMjnnrnfImyY%l$DhQSV>6<^XJdU?RMk!dP8b-X=y1bDJhhf
zm!l|3@J1_|P5{CqQ<YuEOHt`;IJ7drzW8x9YhT+!#k5~(Zobvwd7quDKf~u!e=0dt
zaGBLPU-EI);*eNZkFI(5@%qCnNR7#)D!Yz|HXGhHPmkI=C1qu01^w^U)YOE{X2a+6
zVKf@C+wB+(1_1niKP@dS2qCc9Y<N5#Vq#(f`+Cb&Ri&k+1w~P?TCI4!-T><wExBiO
z<KO4q<mGkIv^A?3EE17JjmRdcf1{2&8r}v4Ndj}U0birapiv#~Vr{oHTANg~c7eex
zVU0BqF;MQ4-TA{G@aUR%AFFKw&kY4bdjxN16_7D(Iv*U(?zNXvW@ct9U=G&oaKyb?
zb-HnF!EMquM}?`HhevI}Z8V{Bx#<!scD&19mJ2=BNScgMmgSRvzkgyFe`*XGO1u7x
zC1Ft{14kOeRL#R9VNu6>oWUYteNM(;kb11KwApSM?RNXJ#>U2@LWutT6nczk_vjmK
zdtT}>_oRgF`3H^FR1M9e=dxxHkw!<p1mJW!$2B%KmU_M36d^>|AO3w)>cd^aV~2!{
m%^Z2hF)()FFCYC`^)Dpi62poJ-2|@y0000<MNUMnLSTY;3gQC*

delta 1458
zcmV;j1x@<T3$+U&iBL{Q4GJ0x0000DNk~Le0000@0000J2nGNE0M(6vH<2+He*hVD
zMObuGZ)S9NVRB^vL1b@YWgtmyVP|DhWnpA_ami&o000F-Nkl<Zc-rh(TTEO<82--g
zVVCai;VebyE}DX*H!h_`+Yn3zg+L8P2tIg=g6TsOVt_P6tq=6}q`lCzKG?(*X&RG8
zQYft^+EyU7LX=_&wm=CM=|Ur+e{pZz_vZO$yNA6sX_MM@6DNF`Ip3N2=Re>6^Un;N
z$KyduON$=BW<;Rai+)EGmHr(o4_LUy#zqpWOM(~)FT^TyG>K-F@DktK+j}ljf-x_O
zE=QASq|-Ux?RKX`(hIlSgD5L0Jms{=iiW5w6loE4z!Qa{DM++nWMyTcf1#lP;odz6
z(hkh(^73+q;P*vEMcBD>XXscd(*JE-+%o-G?S+lBrKKe}91c866z1jS!C)|8adGkf
zvI`tbJRz8W5`mt5Bo0q)Q$4;&qns8FMxzm@PoG9xTN@4^K8&QKBnEo+^(ihcMs;;H
zYxnf@gxIL4s9^mGrKP3bf8`iFmwOq{3HdmY^&{G!A4Ny*J=WGKME342V=dzdd)Ax`
z;SOy$%Q&ii9K9!Qpx!3;C!4`z45}1-z3H0F6JAZM4Dih#VV5U;j35Z8s;WY6ZZ5{h
z$C*G*r&Eq10!5^M^!UaS($dnHXg(VzlZo-6%M&sjGtvj}DR|>le?GDf#ldVg<4r>?
zdp9<Dn{h9EzFHEu00wm`@`W<gpRZ#4k&ZpkD)m?!y9uv+na#MXw>se4oT*;2xZ#}h
zFdGEwyH>ji`Eh0Vd9;&_IeKL;ez?_!Z~DIq@Xa3&6m4i|2y=6DNK8ybUtb^8YIT4(
z1g%yp3lS_D^(Pxse^XPkjc}p`{))ihU)NzzF=1sMk4v}PuwqeU(f0b9_i^Jx8@g-m
zAWo%+Yu=6eZ!7U)_RF|fGk|TGg|N<<QGcNlAD11#+3G8ZkB?_|y&H~HOMjO}+o0Sy
z!(dymV8xP%?ms$FvaW*J-<7`~z4yAHPU0Rd(g^A4>1>Hoe|ziJt+3f_3{)tJh%YE8
z2*_Xl`O0dwG8@Us$+8W9!IuFUbo$9K<RCfjS@vAAz5>>H3kvk*&_a)lPX%m0u~E*2
z=2a%_@2o?~7uk3>wGKv2Dh5<PVV4wrd%vs2M;S-uoXPA{KGH~HD8RsY2Qa6$!eky}
z_6hBGPX+iDe~hpj0Y${b!~~8XKMtKvhvDI296WdsE|&|ft*wlwLVUPLqcSowg68IC
zG&MEJeM!iWjll1mNNwx987Ff(AjIe~IDH+>Hya@e@p#8rhr!);OwRualVyy})0EeV
z4TAT|+%w(@^UUA)rEK|H)_8S~Y~Ou<1%#VZrxKC5e=3LBXTI9|Q8!QlyVDYOBj8F(
zN<86q&)L~oCK64=^E~u=Jvfeo-EPOi!h-jZC-DTzf78>`Y#Gv$rlQekSextw_w_Hf
z-M`B19903{d!`OM&b$VX3s7n~2pPQ8_P~DA1^1$~G}IjHD`YA$bIS$Stk?Y*k%M*}
z4@<8@f3~+`wGy#UD`4(%AU-b!3zOa-j5xL$ese;TrbPSpel)b#pnI&7@s~fifzL*F
z;hL@M;Saa;aiS=OL?40j7$NZ3;6_410;^+VV`YxozGwfw54=WE1W4Z#w}oG(;N^tP
z$`C(wS%Dn&6?6Fz`@~VLGI9ZP`fQ%L)`X_Fe=o>mzLz$F?(q)rA{Rc=3JVJ(dXKVy
z(kHi_Ru2~Lx}i%~K2aYQr8(#Cxa8-U1O>EfmH*vql>hV!frDnf@`>L^V+;z0hdp%j
zQr<cy)ph^>m*b(!F^=+-bR5`6|6GfN2lJJ~(Ii;cjT-yDe*_o+c|~sOnh$pJ00000
M2uVdwM6N<$g4No)i2wiq

diff --git a/public/images/result/passing.svg b/public/images/result/passing.svg
index 07f815bc..fbd334e3 100644
--- a/public/images/result/passing.svg
+++ b/public/images/result/passing.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="90" height="18"><linearGradient id="a" x2="0" y2="100%"><stop offset="0" stop-color="#fff" stop-opacity=".7"/><stop offset=".1" stop-color="#aaa" stop-opacity=".1"/><stop offset=".9" stop-opacity=".3"/><stop offset="1" stop-opacity=".5"/></linearGradient><rect rx="4" width="90" height="18" fill="#555"/><rect rx="4" x="37" width="53" height="18" fill="#4c1"/><path fill="#4c1" d="M37 0h4v18h-4z"/><rect rx="4" width="90" height="18" fill="url(#a)"/><g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11"><text x="19.5" y="13" fill="#010101" fill-opacity=".3">build</text><text x="19.5" y="12">build</text><text x="62.5" y="13" fill="#010101" fill-opacity=".3">passing</text><text x="62.5" y="12">passing</text></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="90" height="18"><linearGradient id="a" x2="0" y2="100%"><stop offset="0" stop-color="#fff" stop-opacity=".7"/><stop offset=".1" stop-color="#aaa" stop-opacity=".1"/><stop offset=".9" stop-opacity=".3"/><stop offset="1" stop-opacity=".5"/></linearGradient><rect rx="4" width="90" height="18" fill="#555"/><rect rx="4" x="37" width="53" height="18" fill="#4c1"/><path fill="#4c1" d="M37 0h4v18h-4z"/><rect rx="4" width="90" height="18" fill="url(#a)"/><g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11"><text x="19.5" y="14" fill="#010101" fill-opacity=".3">build</text><text x="19.5" y="13">build</text><text x="62.5" y="14" fill="#010101" fill-opacity=".3">passing</text><text x="62.5" y="13">passing</text></g></svg>
\ No newline at end of file
diff --git a/public/images/result/pending.png b/public/images/result/pending.png
index 82620d7fc665ed45b2ed7117b9abd1300b3c76f8..f1274d9a4861a565d6b8fd2dd68f7b5d658ec3bc 100644
GIT binary patch
literal 1462
zcmV;n1xfmeP)<h;3K|Lk000e1NJLTq003M7000sQ1^@s6*1fqz00004b3#c}2nYxW
zd<bNS00009a7bBm000XU000XU0RWnu7ytkTSV=@dR9J=0nQLfMXBfwS=j75PnpRy}
zwXH>mR72af*2^|(N2_iQbk!)>DRmC34xBj951Uk(b~5*AV9Rv+AuEcELOa=%eb~^>
zDXVvjmsy=oa89hwiq>43oRfDSYL2;_G@aDNKm0k*`~IKje;yv*ydgvasI9Fn%g@hm
zbT}LZX0zE$icwMcSE^eWG^mO~clX^#S39q+e)prF_DM^YEGe<u?Z;$U9+K+j!dN@!
zY^qxrbOZvDIDdnMMqr!I=X+s>4IrxzQr*I!!(u=hJ>0U(2$TyUQr%A!)KIEBcs_90
zdoyKOmWK!-(Bqyxdvy2z3;Xj(q^Th(C3Mce@?8B5GRXZ63wWj>@7=q1Kpu%SHIy0x
zT3ooG^SQjknCv=vmg}anvXboV>;ZY`X{o$Y!tZYQB$w%>ga6eghe9C|5um!d8n@d`
zeSJL+heOl$?b{cX8@X<4Ym4#-#}0>s`ucj@Za3A{)lpg`6-C6cbkP+?7p|vdK?f6N
zwqUU2Xc~s$yj-@EV%J$FzIA}KjH0Nztcj~BcAchh?h%G&y`gCaOAZrewotO5gVBZS
z0W@vx7q<rJF@_1VS~ZW-MOSqD4>Re&JsuA(mx~i8PEb=*qdUmhb)tCb(xtSwx8riT
z@caFV2d;`Z0(3v@Wyh9DT)lLJoRT_C%birmh0_Q5>eE6F|L_@kQ?^FcJ@iQI+%lO%
z`!`3`<&<os^I{u2woKx|qhQ~_BkBg?kvpl5&hv+LJ@hE6s!AdPw6wHfwOVOyZN=$y
zMrpCR$zrF|$^QNOv0AM(H#f(5gsCW@I09TczKepf0sc7iHR)MXH7#TGbjs&_$=c6v
zF!#N^3>}dlRd?Z7BL(9WdjI(uTSlIyrDsj$`q|wSj16$Hedm)C{<Ll&9`?*BTsyl<
z*F%rS@F`3Li^YP^=fi5XY9})G8UAq^>7^G7ArksUB7CZ1;TUE>s862aX`T=g4Vy}M
z{O}F{k_4|7*|fUMVJbp^-6oJE`Dq;@$}{%ek#T<>StASxMc*S9Nl$oHRTXBlnfdeQ
zbMD+ZO}l;jHq)j}!(=isZ{9p0`3djn=!o)*)FK%ShT;g2SGWR!mAqG0ar0Wcrd|8}
z5DRNI^LlAEWmCuT{+iuUb&Ap#hfix*yLs(+lxL(C8z=I(b^Ro{1+{%1MJu8-JtiG^
zC={ZpsfnVZA{rYTHEsL$?JQru9Jkwz*Xte7z#AGGC@wChsi_G?Q4$Yai6_8gzeL5d
zQ)G-P<LJSSn)cg|bv*Wkn7+7;DOJsMoIDU!7wZ#_j~=KaBfFf6Wv6)T6;WEEIClN(
z!A%Uysib1rDf~ezfnJYp|6xkAXU|S}{_owphs|cg=ksAS8nN5$7z}+Mn?N8yPfrg*
z2y8YR9*>92%uKCLFIH8Ro}L~QMZs#d;`MqpEfOo=JRi5WaQ$r>KF;E9w~EywF)qhM
znn`-%3peisdE^OUkR@`mj0{hg0XTEHm&wjF%_nl*8x-95JBZKUcP-qxuWDLkUcVlJ
zK97KEV%D4w$eZ{!r@vp2XrxFpX3X#dX$dn@fEBYY#_cWM(8aggMy8;f<XF6+3n5hQ
z-|6JLZ$88>UDnN0g@jR-<&%Lxp!|RCv0ns&O5EPMnskcuO)2OmIo8#rBS~N}ON<$1
zAdn{M=J{3oeWTrOU*FZ$^@|X~rkj-lc)V)d-uPTucmGAe_*_|wLuv?*H$F$jC`{&;
zR!RUam+Q5zuC4~J*IO)vNckTS?@awO)h!GfBqU6hArD3j8@X!D){d5c0b=H`y;kfS
Q1^@s607*qoM6N<$f~sY{=Kufz

literal 1494
zcmV;{1u6Q8P)<h;3K|Lk000e1NJLTq002(_000sQ1^@s68YF|S0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU%cu7P-RCwCdSY1q$R~UZUe%Mm}>MD$a
zqewA;GSS7Mvdo(J!>;5fn(StJVPeb{SacV=kvTIj#3d?bar1&~a5Do&&?~*rf!oNk
zh!*^#B92NOR#c$11^V~xd*9lRQi^fOwBt?QoO7OY-uImIeD8U`^L>hzmKGg=c1g{M
zgKS@S3-eGqC9M?N+S=kq9Lf8Mm**pS#8<l@ilRB5tMCUz%u_K7!C)}1EAaU-Zzb;J
z`2+KpJSCAAt;NN~sH>|(tiHLlwY8PYii!%>=>ClxH)8kh-Lr7NUwrLqc<)>2az8=h
zq7RX~zV$!zOF3^Aqh7BUKA#V<`sR|dvNB|5W@2h;irdk)<dgcMao-z=yfK#uw=;-G
zcRO&U^Ad{l6JFo3r41Sk1~fM}BRM%40|Ns%a^wj2ojP?2m6erT-?C*3^7Hd?^5jW$
zb#*ZwCWri1S65@ljvd_Y@9&4zYDM&X^aR6_mSu)<bsaP*MhFXZc>c5pw=Zmi-#dov
zcWb$i#9?j5K-U+H>6dIpvc81z@xME9>*6-9FE2mC{z#q<Ti_b$!D7<}tgWo!G1RY8
z>ttKo)o<|d#tF8ezDT)tW;G^VwpTm0L_kVP3U=<?i8X81z-F^y^XARcM*T7|q~T}^
z6B4#1&CAO}RaKSjV`ylI@ma?<09l>SgGkUC@ngLihilR>`fL<$FRy`SVF?VyHTdCR
z3FF#~^;np*Rf?z}JQE_0e`#c;aiOub@QP_NE=VK=#gKoON94Jv9K3g({hj`<g8dVo
zQB;Eqr$1-B?|M5r&L6;&$AdH08P+)?@6Me&@OV5(Pftg8cQ*<P3ull-l9ZGr6B0=t
ziCV2@9}b5@_EAt!Fgx-ht|}^Nhr<snSgf<dl#zgYH`<YHTnQm%1r}&@*mIy~+D^zp
zK-$3Fo;EBqx*41BjKLdB#i&H;L(4R7vvx@Himc*`IjJ1#JBQNZ1o)Lh?4R(PSKIK>
z#|^B`XM?zZtpOTU>?@Tr94XOSR8)kltSqjVmX^Zlbi(Cwv60DSV%%&t&&Y3)`D}cA
zoPA_xXUjgqV<MHVDq;0Yyc%*=B1xCa?ZQ=6a6cb|{Vxk9C1OtOUx9;rQn|ER+Ck4j
zqgH~Z4NpDg6B#d(Yzd>|pIfj2fndl#VdR@ittM1gsuc3IDN(J!?-!5pJl}s^g2~a|
z8EcHxn2|@A-EK!iLj&hL%2oCC^^BiAdzNvMzP`R0kr)|yl;fJ3n$XzT$ZhgLguX2D
zXoDX27}jmSgaj!P9CiyVzaB?Yf|EB?d#IPkxyJ|bTT8V(m+V6f`LJ9$hDGm~QU2Kz
zh961MOw$HlkjIhtVl3MRrv1<nU%P29J}BSI*n^u*xN&)3%om12O8R1~x2@almX1Y$
z7bpk<bUGar3I#{s<m6=NZ6o2NlpjY%M)-KrQ76%AwOl7Z(PJa!)AFlwJxR)Crq#9h
z>1YKXNo}G6g+>7?>DUZE3Bc|M5wBhV6iE0pXQ*vhq~fx---ld-fYf9KtTw-t<3d{_
zKN$;^P$wub{4~I})NjzMc<hu{lx+RjP_`7Cc6DR_u2i;rD?Jzc4)@~RQT?mGZE2Hf
zX=$_aASvZJ(&$Ll>-Ah}G#VMBdbk}q_GOVLJs+%CDooFdP=ZgFHcuKU;da=^vOGa<
zn-;5LZkX`MeyY>MSyd?DvEx4O-TnoK8lCd^3$0(x`3Wifo4ed=`8<ob=h^x@@aG?w
zurx=A&liJIfuE%}ugg8nNmhmmnR?~_^z$s@+g2+j>m^yj4D3w{&Hu7BMw8bW&tFpW
w_^(Q*FflPv8PA`gBcs82NgVwQ{YQWS0P$Q18#qp1Jpcdz07*qoM6N<$f>PnxdH?_b

diff --git a/public/images/result/pending.svg b/public/images/result/pending.svg
index 301d6a9c..2dc149f2 100644
--- a/public/images/result/pending.svg
+++ b/public/images/result/pending.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="92" height="18"><linearGradient id="a" x2="0" y2="100%"><stop offset="0" stop-color="#fff" stop-opacity=".7"/><stop offset=".1" stop-color="#aaa" stop-opacity=".1"/><stop offset=".9" stop-opacity=".3"/><stop offset="1" stop-opacity=".5"/></linearGradient><rect rx="4" width="92" height="18" fill="#555"/><rect rx="4" x="37" width="55" height="18" fill="#dfb317"/><path fill="#dfb317" d="M37 0h4v18h-4z"/><rect rx="4" width="92" height="18" fill="url(#a)"/><g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11"><text x="19.5" y="13" fill="#010101" fill-opacity=".3">build</text><text x="19.5" y="12">build</text><text x="63.5" y="13" fill="#010101" fill-opacity=".3">pending</text><text x="63.5" y="12">pending</text></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="92" height="18"><linearGradient id="a" x2="0" y2="100%"><stop offset="0" stop-color="#fff" stop-opacity=".7"/><stop offset=".1" stop-color="#aaa" stop-opacity=".1"/><stop offset=".9" stop-opacity=".3"/><stop offset="1" stop-opacity=".5"/></linearGradient><rect rx="4" width="92" height="18" fill="#555"/><rect rx="4" x="37" width="55" height="18" fill="#dfb317"/><path fill="#dfb317" d="M37 0h4v18h-4z"/><rect rx="4" width="92" height="18" fill="url(#a)"/><g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11"><text x="19.5" y="14" fill="#010101" fill-opacity=".3">build</text><text x="19.5" y="13">build</text><text x="63.5" y="14" fill="#010101" fill-opacity=".3">pending</text><text x="63.5" y="13">pending</text></g></svg>
\ No newline at end of file
diff --git a/public/images/result/unknown.png b/public/images/result/unknown.png
index 6f3e3e8712bb158284af0627bb64220fc61fadea..1720236a97a006b3684ce256fa9883047a904ec5 100644
GIT binary patch
literal 1346
zcmV-I1-<%-P)<h;3K|Lk000e1NJLTq003eD000sQ1^@s6poa_300004b3#c}2nYxW
zd<bNS00009a7bBm000XU000XU0RWnu7ytkS<Vi$9R9J=WnL%h1Ss2HEGflEHV}{U@
zYHf>$h}CwH7OiD5c(4~QZB1AtsP)j6-NK@$J>=fYo;=u|_7aL%XiJK{dDDd!)b*g~
zK}w`bX<E`+7d9j*>CC)6NQTB{lB{U5yX+r6=DqpP_n$xS<9qW+B!IE8v0z6>$CTgi
z|JLL2c&IZ1fk3@2e07+n$@};3|4bwjKSiU_8R^=!YdyNIFUzugsNUuZ2nK`owoo(d
z?d^$VGWop=_$8Oi{bPy%U>HWdEz}H>BuSd4{ptcP2qEh2rwEp1)!RZ%;q`i(Wm%RF
z2_YyIckkXUdH?T3ISnVyvaBx_BO@bURPSqqEX%kmb;IX$%e{N|7#<$3N~09_r90x^
z&|zPt5En0Aq_wrRDvkdO@ey*lmH~)FBE(`bCMG8E`~5aIGc!~4?Ed+qM~{j$3S+<D
z&&0$8u~>{qBvQof55q7H#Q6BQ<9vL4oSvQ@Mn*=se*HRaZEZFOA3y$Xx0_HXL?95T
zn4_vHgM)*Nj*c=gFo3G67>2>oqemGW9JKYu#>Q~F-57?!)vH(Wdc763ouXnPGMNnF
zaG0l0pE5i=TylXwojZ+h+_=Hx$Bzkz!|d+vIu^n-%>w~A&H-|{9MNc$xw$#cpFdy3
zX`05szyOPji#&Pqq+(7m807Wq*F>XHR#sMQ?#-JwG&MD0Sr*5SA4isD`|5VP+1%W$
zsO=PTIT9cqkE5z83kwT$c6L_1Fr~(wot@mje;-v<nVXwCpi#+7x%WMM_>lJYc9O{?
zjg5^(TqqRc!Gi~EZEfN8dMoC%wzjgoyi8kLn|(D+6Cng2K72sebxxf+#p2>3Cr_Tl
z=ku|?zD`3!Lq%=JLR9JqMNtq!peTxC7r0!msyd>e<D^%vBMPS}(=?GJ=|CZLT}KFk
zs;WqmRK(5B&N4JKL`zFcRXIWkd_G^%wQ&F4yLWVTbzxZ+&z?O4prfOM_4W0tv_HEe
zhK7dlcsztcA)Y^fZgU$O8}#+{;dZ;ZeED)!9r5DDiy}RzjwrQ<Zf|cB2n3KMiL+<V
z0u+4*3VDTh?&p%pB=ht0T)A?^-p9-3BoYaFdwY>(nRDmPv9hvab8BmB^!E0$w6uiJ
z=VNJUi8E);u(7dGl^@4%M5RJlmc{h+G^bCWW@>86=I-3N!|3QJu~>|3Hd|F8CMPH9
z?(SxKdb-GPHHDa+ou$9OpPM&tl1`@&EcX6qKjjofVRdztcsx!d62a^Bmd%-;pQojz
zg<H37arp3I78Vw4E}2YXSr)Hey}~dIUcP*ZWm#-)ZdT>TDWpr6E;*hpx3{;^G>u#?
zhs)(c*L4~i8UV=W^Q6;hgb-+&MkbS?xw+ZSD>XJvlXN<5pG>mZtj+C5UtiyWdznmz
zt*tFA%c8Ndk)53#PMkOaKq8T_$DhvkkJITiJ3BkHx3}~5?OVqj!!SstQta;Tq9_VS
zjvTSK-+VsL+S(d{Kmb{mu`G+#)m4riJ4WI6(sF*BAoch6?*iYHeX7PNRfzvGgb=u7
zS^hnr&tIswnf=(?+pD*QnnDP%<I;8g=Ts{7n-D^)x1j=Zxm>+1)Dl9|v>zmZa5(&3
zDwUedX0zQwh`RqV)Ya8hZwobnq9}hfH8uTs`}XblUoGyHFH)wchyVZp07*qoM6N<$
Ef-ujK?f?J)

literal 1131
zcmV-x1eE)UP)<h;3K|Lk000e1NJLTq002|~000sQ1^@s6#cKJm0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$4M{{nRCwC#SW76pQ4~KjM&1mOXUMBa
zHbjwT;ZYVcl$}V)f~}2WVI{0AC<}_6x3WZ$l9ZCjD<mYZh4<T-->G~1=JSpJ|DUP(
zH_fTj+<U%r&OP^c&pG$|MmI7tVkDv|E1Sp(l%AeWE<y`dHX9}<C!Gc+=>GoRRR9Hs
zQwEF0Vsd5_A0Hp&LS!<0etwc0P{)xQPzRG9fT|f6MQdv-X+5*YqobqzTUJ)atbSfl
zP(bzd_21+G^f%nl(C}*?j%4)EZz#XMzS7&<8)-eWN4dGV6cG_YFE1}VSKGoTo~h-I
z$k6{O%QZ_Ln~sc(q@kf9^7r?r{r!FF?Cj)ceSLjoHk)}|TwF{^NlDb(+e=GJODq?F
z!EZ%H1yxs9^L%e_k9Kx;NWGpCjEsy7N=Zqfv9U3p7ZnxJ`T04mudh>MV<X+%+)#LU
zI6s5V(b19g0lVz%Y?_{)W;<_hZ>hVuxJWB2D-;wIM5U#rHgd#NRaHejJw0rLb!KK}
zcunYH{n*%8O@Dt~@&F|uAb@IWYA7cshXY5D@9*ytEU?Hr0g|u<CnO|Ld3m|?aeREt
z@}Ei`uTam=&vO3o@W3*Rv7y=7S*oqA<@S=Anko+?EG&#NGc)<n0RVj90HNE})kRrZ
zS*)9vmnY?IZEY;q>-B5{A8Bc6ba{Enl?MHom>8Oyo3rari|qoswY5c$kB_|2>gp<a
zd3o6Y2ln&xlOU-9g+6?UVBzCWfC^hN_wn(Oa}crynW)q0$Y3x?d1YlKEiW%qaBwgK
z1RJ62;o-r4po=(!9BUsQ9<mH^A_0<<lWBZ>oDvfgd3<qk!Ry%brwORogqo27QBhGm
zMk(Fi-qPLO9d7^&LT)mdZ2G0LKcYP0BRV=-`VcxwRtAHN3=It>Pft$@3=EVT7r>!v
z#8@dG7#N_Ek`kG<;y`(WR)9rY*xcNd*@ZHWkB{eec5raOwy*)n8yg$EHza|GS<9d1
zrKHtEAv-xaq3-T(?xE;29UUDkpO~0nIcR%(Tk0z_RP@Zj!9nWp@8>yu0OX%~=<e<=
z<>%*9Q&SVqu{kAhN-&jk=(V@EQ*(1OU0+|@0It+U`PS9dQA<k;%Z7)Cxq?JXnV+90
zUteEZTU+A<fM4|is@GPN&U&#}v~GE1i#Tnhz0qjoQbU%ar|^wtm4lHv=shSOv<VOb
z!x(<lx=KQSRUf4Ak4@qt0RwDgtjK=!R%E}BqnE=Leede(ipw7{;B5uKKnLTqvoq-*
z)esUA!eeAA)`1LrgkD@+9B1a~>8YkaO+X6^3oXuk%@D1?WxkaD<z3VLrR4tfbPAvg
x&iwn%#Q<F}JUu;`o%shdE*Mw(gZWE<0RTQ=VqjmvmN)<a002ovPDHLkV1fb35KaI9

diff --git a/public/images/result/unknown.svg b/public/images/result/unknown.svg
index 692fe970..f31cbc38 100644
--- a/public/images/result/unknown.svg
+++ b/public/images/result/unknown.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="98" height="18"><linearGradient id="a" x2="0" y2="100%"><stop offset="0" stop-color="#fff" stop-opacity=".7"/><stop offset=".1" stop-color="#aaa" stop-opacity=".1"/><stop offset=".9" stop-opacity=".3"/><stop offset="1" stop-opacity=".5"/></linearGradient><rect rx="4" width="98" height="18" fill="#555"/><rect rx="4" x="37" width="61" height="18" fill="#9f9f9f"/><path fill="#9f9f9f" d="M37 0h4v18h-4z"/><rect rx="4" width="98" height="18" fill="url(#a)"/><g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11"><text x="19.5" y="13" fill="#010101" fill-opacity=".3">build</text><text x="19.5" y="12">build</text><text x="66.5" y="13" fill="#010101" fill-opacity=".3">unknown</text><text x="66.5" y="12">unknown</text></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="98" height="18"><linearGradient id="a" x2="0" y2="100%"><stop offset="0" stop-color="#fff" stop-opacity=".7"/><stop offset=".1" stop-color="#aaa" stop-opacity=".1"/><stop offset=".9" stop-opacity=".3"/><stop offset="1" stop-opacity=".5"/></linearGradient><rect rx="4" width="98" height="18" fill="#555"/><rect rx="4" x="37" width="61" height="18" fill="#9f9f9f"/><path fill="#9f9f9f" d="M37 0h4v18h-4z"/><rect rx="4" width="98" height="18" fill="url(#a)"/><g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11"><text x="19.5" y="14" fill="#010101" fill-opacity=".3">build</text><text x="19.5" y="13">build</text><text x="66.5" y="14" fill="#010101" fill-opacity=".3">unknown</text><text x="66.5" y="13">unknown</text></g></svg>
\ No newline at end of file

From f91c54725e563b7f82c77e617efa354449ac150e Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Tue, 2 Sep 2014 10:44:31 +0200
Subject: [PATCH 05/70] Add a feature flip for education field update

---
 lib/travis/api/app/endpoint/authorization.rb          | 5 ++++-
 spec/unit/endpoint/authorization/user_manager_spec.rb | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/travis/api/app/endpoint/authorization.rb b/lib/travis/api/app/endpoint/authorization.rb
index 24fddbcd..5733959d 100644
--- a/lib/travis/api/app/endpoint/authorization.rb
+++ b/lib/travis/api/app/endpoint/authorization.rb
@@ -216,7 +216,10 @@ class Travis::Api::App
           def info(attributes = {})
             info = data.to_hash.slice('name', 'login', 'gravatar_id')
             info.merge! attributes.stringify_keys
-            info['education'] = education
+            if Travis::Features.feature_active?(:education_data_sync) ||
+              (user && Travis::Features.owner_active?(:education_data_sync, user))
+              info['education'] = education
+            end
             info['github_id'] ||= data['id']
             info
           end
diff --git a/spec/unit/endpoint/authorization/user_manager_spec.rb b/spec/unit/endpoint/authorization/user_manager_spec.rb
index 5e48ec0b..4b5b5c04 100644
--- a/spec/unit/endpoint/authorization/user_manager_spec.rb
+++ b/spec/unit/endpoint/authorization/user_manager_spec.rb
@@ -3,6 +3,10 @@ require 'spec_helper'
 describe Travis::Api::App::Endpoint::Authorization::UserManager do
   let(:manager) { described_class.new(data, 'abc123') }
 
+  before do
+    Travis::Features.enable_for_all(:education_data_sync)
+  end
+
   describe '#info' do
     let(:data) {
       {

From ea73404eb309608a602eacbdfc095b962d7da0b9 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Tue, 2 Sep 2014 10:44:52 +0200
Subject: [PATCH 06/70] Bump travis-core

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 97eaff2b..bb8afdf8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -37,7 +37,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-core.git
-  revision: 8f2b4add4581f2897ce14edca26aff99cc60f280
+  revision: 2115edc5994422748071c73561514703fe708e0c
   branch: ps-education-sync
   specs:
     travis-core (0.0.1)

From eab57dfb8f42e91c77a5a966abb785c50dd4d371 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Tue, 2 Sep 2014 11:47:58 +0200
Subject: [PATCH 07/70] Use travis-core from master

---
 Gemfile      | 2 +-
 Gemfile.lock | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 1fa1b345..49579f5c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ ruby '2.1.2'
 source 'https://rubygems.org'
 gemspec
 
-gem 'travis-core',     github: 'travis-ci/travis-core', branch: 'ps-education-sync'
+gem 'travis-core',     github: 'travis-ci/travis-core'
 gem 'travis-support',  github: 'travis-ci/travis-support'
 gem 'travis-sidekiqs', github: 'travis-ci/travis-sidekiqs', require: nil, ref: 'cde9741'
 gem 'travis-yaml',     github: 'travis-ci/travis-yaml'
diff --git a/Gemfile.lock b/Gemfile.lock
index bb8afdf8..a9b9c803 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -37,8 +37,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-core.git
-  revision: 2115edc5994422748071c73561514703fe708e0c
-  branch: ps-education-sync
+  revision: c33c0d40306e2493d4b65ca00be6731a4e614bed
   specs:
     travis-core (0.0.1)
       actionmailer (~> 3.2.19)

From 3e33ab15d56e95eb54aa1addcf7ac97c20366a66 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Wed, 10 Sep 2014 10:17:33 +0200
Subject: [PATCH 08/70] Put automatically generated settings subclasses to
 Endpoint namespace

---
 lib/travis/api/app/endpoint/setting_endpoint.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/travis/api/app/endpoint/setting_endpoint.rb b/lib/travis/api/app/endpoint/setting_endpoint.rb
index b7c47b76..dc1fb13a 100644
--- a/lib/travis/api/app/endpoint/setting_endpoint.rb
+++ b/lib/travis/api/app/endpoint/setting_endpoint.rb
@@ -9,11 +9,11 @@ class Travis::Api::App
       # a new SettingsEndpoint subclass, which will be then used as an endpoint
       def subclass(name)
         class_name = name.to_s.camelize
-        if Travis::Api::App.const_defined?(class_name)
-          Travis::Api::App.const_get(class_name)
+        if Travis::Api::App::Endpoint.const_defined?(class_name)
+          Travis::Api::App::Endpoint.const_get(class_name)
         else
           klass = create_settings_class(name)
-          Travis::Api::App.const_set(class_name, klass)
+          Travis::Api::App::Endpoint.const_set(class_name, klass)
           klass
         end
       end

From e103b291ad86f5048c401328f995ee871da6d17a Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Wed, 10 Sep 2014 10:46:13 +0200
Subject: [PATCH 09/70] Reset value when env var is changed from private to
 public

When env var is changed from private to public, we didn't nullify it, so
someone doing that could miss exposing it. To minimise the risk of
exposing any secure info we'll now nullify the value.
---
 lib/travis/api/app/endpoint/env_vars.rb       | 31 +++++++++++++++++++
 .../api/app/endpoint/setting_endpoint.rb      | 14 ++++++---
 spec/integration/v2/settings/env_vars_spec.rb | 14 +++++++++
 3 files changed, 54 insertions(+), 5 deletions(-)
 create mode 100644 lib/travis/api/app/endpoint/env_vars.rb

diff --git a/lib/travis/api/app/endpoint/env_vars.rb b/lib/travis/api/app/endpoint/env_vars.rb
new file mode 100644
index 00000000..0bed10fe
--- /dev/null
+++ b/lib/travis/api/app/endpoint/env_vars.rb
@@ -0,0 +1,31 @@
+require 'travis/api/app'
+require 'travis/api/app/endpoint/setting_endpoint'
+
+class Travis::Api::App
+  class Endpoint
+    class EnvVars < SettingsEndpoint
+      define_method(:name) { :env_vars }
+      define_routes!
+
+      def update
+        data = JSON.parse(request.body.read)[singular_name]
+        previously_public = record.public?
+        record.update(data)
+
+        # if we update from private to public reset value
+        if !previously_public && record.public?
+          record.value = nil
+        end
+
+        if record.valid?
+          repo_settings.save
+          respond_with(record, type: singular_name, version: :v2)
+        else
+          status 422
+          respond_with(record, type: :validation_error, version: :v2)
+        end
+      end
+
+    end
+  end
+end
diff --git a/lib/travis/api/app/endpoint/setting_endpoint.rb b/lib/travis/api/app/endpoint/setting_endpoint.rb
index dc1fb13a..44aca127 100644
--- a/lib/travis/api/app/endpoint/setting_endpoint.rb
+++ b/lib/travis/api/app/endpoint/setting_endpoint.rb
@@ -21,13 +21,17 @@ class Travis::Api::App
       def create_settings_class(name)
         klass = Class.new(self) do
           define_method(:name) { name }
-          get("/", scope: :private) do index end
-          get("/:id", scope: :private) do show end
-          post("/", scope: :private) do create end
-          patch("/:id", scope: :private) do update end
-          delete("/:id", scope: :private) do destroy end
+          define_routes!
         end
       end
+
+      def define_routes!
+        get("/", scope: :private) do index end
+        get("/:id", scope: :private) do show end
+        post("/", scope: :private) do create end
+        patch("/:id", scope: :private) do update end
+        delete("/:id", scope: :private) do destroy end
+      end
     end
 
     # Rails style methods for easy overriding
diff --git a/spec/integration/v2/settings/env_vars_spec.rb b/spec/integration/v2/settings/env_vars_spec.rb
index 90a7d460..5c486f02 100644
--- a/spec/integration/v2/settings/env_vars_spec.rb
+++ b/spec/integration/v2/settings/env_vars_spec.rb
@@ -83,6 +83,20 @@ describe Travis::Api::App::SettingsEndpoint do
     end
 
     describe 'PATCH /settings/env_vars/:id' do
+      it 'resets value if private key is made public' do
+        settings = repo.settings
+        env_var = settings.env_vars.create(name: 'FOO', value: 'bar')
+        settings.save
+
+        body = { env_var: { public: true } }.to_json
+        response = patch "/settings/env_vars/#{env_var.id}?repository_id=#{repo.id}", body, headers
+        json = JSON.parse(response.body)
+        json['env_var']['value'].should be_nil
+
+        updated_env_var = repo.reload.settings.env_vars.find(env_var.id)
+        updated_env_var.value.decrypt.should be_nil
+      end
+
       it 'should update a key' do
         settings = repo.settings
         env_var = settings.env_vars.create(name: 'FOO', value: 'bar')

From 6e5f225a1c702a6d0307e9eb4b789bb4386c74b2 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Wed, 10 Sep 2014 11:02:24 +0200
Subject: [PATCH 10/70] Don't reset the value if a new value is provided

If a value is provided with a request to update the record, we should
not nullify it. We don't send decrypted private values to the client, so
if client provides it, it's probably pasted by the user.
---
 lib/travis/api/app/endpoint/env_vars.rb       |  2 +-
 spec/integration/v2/settings/env_vars_spec.rb | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/lib/travis/api/app/endpoint/env_vars.rb b/lib/travis/api/app/endpoint/env_vars.rb
index 0bed10fe..2cbcd56c 100644
--- a/lib/travis/api/app/endpoint/env_vars.rb
+++ b/lib/travis/api/app/endpoint/env_vars.rb
@@ -13,7 +13,7 @@ class Travis::Api::App
         record.update(data)
 
         # if we update from private to public reset value
-        if !previously_public && record.public?
+        if !previously_public && record.public? && data['value'].nil?
           record.value = nil
         end
 
diff --git a/spec/integration/v2/settings/env_vars_spec.rb b/spec/integration/v2/settings/env_vars_spec.rb
index 5c486f02..c7e2d789 100644
--- a/spec/integration/v2/settings/env_vars_spec.rb
+++ b/spec/integration/v2/settings/env_vars_spec.rb
@@ -83,6 +83,20 @@ describe Travis::Api::App::SettingsEndpoint do
     end
 
     describe 'PATCH /settings/env_vars/:id' do
+      it 'resets value if private key is made public unless new value is provided' do
+        settings = repo.settings
+        env_var = settings.env_vars.create(name: 'FOO', value: 'bar')
+        settings.save
+
+        body = { env_var: { public: true, value: 'a new value' } }.to_json
+        response = patch "/settings/env_vars/#{env_var.id}?repository_id=#{repo.id}", body, headers
+        json = JSON.parse(response.body)
+        json['env_var']['value'].should == 'a new value'
+
+        updated_env_var = repo.reload.settings.env_vars.find(env_var.id)
+        updated_env_var.value.decrypt.should == 'a new value'
+      end
+
       it 'resets value if private key is made public' do
         settings = repo.settings
         env_var = settings.env_vars.create(name: 'FOO', value: 'bar')

From 68a49057cacb458401014c07c65d51b03d8ab1a2 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Wed, 10 Sep 2014 11:05:35 +0200
Subject: [PATCH 11/70] Fix specs, namespace for settings endpoints changed

---
 spec/integration/settings_endpoint_spec.rb           | 2 +-
 spec/integration/singleton_settings_endpoint_spec.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/integration/settings_endpoint_spec.rb b/spec/integration/settings_endpoint_spec.rb
index 89745946..b53f2ca6 100644
--- a/spec/integration/settings_endpoint_spec.rb
+++ b/spec/integration/settings_endpoint_spec.rb
@@ -29,7 +29,7 @@ describe Travis::Api::App::SettingsEndpoint do
   end
 
   after do
-    Travis::Api::App.send :remove_const, :Items
+    Travis::Api::App::Endpoint.send :remove_const, :Items
     Travis::Api::V2::Http.send :remove_const, :Items
     Travis::Api::V2::Http.send :remove_const, :Item
   end
diff --git a/spec/integration/singleton_settings_endpoint_spec.rb b/spec/integration/singleton_settings_endpoint_spec.rb
index 2d16794f..08ed54af 100644
--- a/spec/integration/singleton_settings_endpoint_spec.rb
+++ b/spec/integration/singleton_settings_endpoint_spec.rb
@@ -24,7 +24,7 @@ describe Travis::Api::App::SettingsEndpoint do
   end
 
   after do
-    Travis::Api::App.send :remove_const, :Item
+    Travis::Api::App::Endpoint.send :remove_const, :Item
     Travis::Api::V2::Http.send :remove_const, :Item
   end
 

From 65a90fd5d7d8e3f0daaf1a0ac948192d79880e54 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Thu, 11 Sep 2014 14:35:19 +0200
Subject: [PATCH 12/70] Fix specyfing part_numbers in API

Recently I've implmented a way to get only specific parts from log API,
but the test and implementation were wrong. This commit fixes that.
---
 lib/travis/api/v2/http/log.rb    | 2 +-
 spec/integration/v2/jobs_spec.rb | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/travis/api/v2/http/log.rb b/lib/travis/api/v2/http/log.rb
index b3024cde..849ffea6 100644
--- a/lib/travis/api/v2/http/log.rb
+++ b/lib/travis/api/v2/http/log.rb
@@ -50,7 +50,7 @@ module Travis
             end
 
             def part_numbers
-              if numbers = options[:part_numbers]
+              if numbers = options['part_numbers']
                 numbers.is_a?(String) ? numbers.split(',').map(&:to_i) : numbers
               end
             end
diff --git a/spec/integration/v2/jobs_spec.rb b/spec/integration/v2/jobs_spec.rb
index a8a63b7d..5a40d28b 100644
--- a/spec/integration/v2/jobs_spec.rb
+++ b/spec/integration/v2/jobs_spec.rb
@@ -58,7 +58,9 @@ describe 'Jobs' do
 
         headers = { 'HTTP_ACCEPT' => 'application/vnd.travis-ci.2+json; chunked=true' }
         response = get "/jobs/#{job.id}/log", { part_numbers: '1,3,4' }, headers
-        response.should deliver_json_for(job.log, version: 'v2', params: { chunked: true})
+        body = JSON.parse(response.body)
+
+        body['log']['parts'].map { |p| p['number'] }.sort.should == [1, 3]
       end
 
       it 'responds with 406 when log is already aggregated' do

From 07cd97a90f559d8ff81ffb3f601291fe97e85591 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Thu, 11 Sep 2014 14:36:19 +0200
Subject: [PATCH 13/70] Add "after" param to log

after query param allows to get only parts that come after a specified
number, for example "after: 10" will download only parts that come after
10th part.
---
 lib/travis/api/v2/http/log.rb    |  6 ++++++
 spec/integration/v2/jobs_spec.rb | 12 ++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/lib/travis/api/v2/http/log.rb b/lib/travis/api/v2/http/log.rb
index 849ffea6..38af5417 100644
--- a/lib/travis/api/v2/http/log.rb
+++ b/lib/travis/api/v2/http/log.rb
@@ -39,6 +39,7 @@ module Travis
             def log_parts
               parts = log.parts
               parts = parts.where(number: part_numbers) if part_numbers
+              parts = parts.where(["number > ?", after]) if after
               parts.sort_by(&:number).map do |part|
                 {
                   'id' => part.id,
@@ -49,6 +50,11 @@ module Travis
               end
             end
 
+            def after
+              after = options['after'].to_i
+              after == 0 ? nil : after
+            end
+
             def part_numbers
               if numbers = options['part_numbers']
                 numbers.is_a?(String) ? numbers.split(',').map(&:to_i) : numbers
diff --git a/spec/integration/v2/jobs_spec.rb b/spec/integration/v2/jobs_spec.rb
index 5a40d28b..13be7a25 100644
--- a/spec/integration/v2/jobs_spec.rb
+++ b/spec/integration/v2/jobs_spec.rb
@@ -51,6 +51,18 @@ describe 'Jobs' do
     end
 
     context 'with chunked log requested' do
+      it 'responds with only selected chunks if after is specified' do
+        job.log.parts << Log::Part.new(content: 'foo', number: 1, final: false)
+        job.log.parts << Log::Part.new(content: 'bar', number: 2, final: true)
+        job.log.parts << Log::Part.new(content: 'bar', number: 3, final: true)
+
+        headers = { 'HTTP_ACCEPT' => 'application/vnd.travis-ci.2+json; chunked=true' }
+        response = get "/jobs/#{job.id}/log", { after: 1 }, headers
+        body = JSON.parse(response.body)
+
+        body['log']['parts'].map { |p| p['number'] }.sort.should == [2, 3]
+      end
+
       it 'responds with only selected chunks if part_numbers are requested' do
         job.log.parts << Log::Part.new(content: 'foo', number: 1, final: false)
         job.log.parts << Log::Part.new(content: 'bar', number: 2, final: true)

From 3b9c864affe8cb57e56a02f761c48ef2386695c6 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Thu, 11 Sep 2014 14:47:56 +0200
Subject: [PATCH 14/70] Fix specs

---
 spec/unit/api/v2/http/log_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/unit/api/v2/http/log_spec.rb b/spec/unit/api/v2/http/log_spec.rb
index f6a20b69..3907b774 100644
--- a/spec/unit/api/v2/http/log_spec.rb
+++ b/spec/unit/api/v2/http/log_spec.rb
@@ -31,7 +31,7 @@ describe Travis::Api::V2::Http::Log do
     end
 
     describe "with parts numbers specified" do
-      let(:data) { described_class.new(log, part_numbers: "1,3", chunked: true).data }
+      let(:data) { described_class.new(log, 'part_numbers' => "1,3", chunked: true).data }
       it 'returns only requested parts' do
         parts = log.parts.find_all { |p| p.number == 1 }
         log.parts.expects(:where).with(number: [1, 3]).returns(parts)

From 890b7f1d93908a3330f4ac4de10e666b828db116 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Thu, 11 Sep 2014 17:44:36 +0200
Subject: [PATCH 15/70] Fix Accept header support for logs request

When log is aggregated and archived we don't have a way to return it in
JSON format, only text format. Till recently we were returning a text
response or a redirect to S3 even if Accept header was set only to JSON.
This commit fixes it.
---
 lib/travis/api/app/endpoint/jobs.rb  | 22 +++++++++++++++-------
 lib/travis/api/app/helpers/accept.rb |  4 ++++
 spec/integration/v2/jobs_spec.rb     |  9 +++++++--
 3 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/lib/travis/api/app/endpoint/jobs.rb b/lib/travis/api/app/endpoint/jobs.rb
index 0c497a58..302112e0 100644
--- a/lib/travis/api/app/endpoint/jobs.rb
+++ b/lib/travis/api/app/endpoint/jobs.rb
@@ -3,6 +3,8 @@ require 'travis/api/app'
 class Travis::Api::App
   class Endpoint
     class Jobs < Endpoint
+      include Helpers::Accept
+
       get '/' do
         prefer_follower do
           respond_with service(:find_jobs, params)
@@ -49,15 +51,21 @@ class Travis::Api::App
 
       get '/:job_id/log' do
         resource = service(:find_log, params).run
-        if !resource || resource.archived?
-          archived_log_path = archive_url("/jobs/#{params[:job_id]}/log.txt")
+        if (!resource || resource.archived?)
+          # the way we use responders makes it hard to validate proper format
+          # automatically here, so we need to check it explicitly
+          if accepts?('text/plain')
+            archived_log_path = archive_url("/jobs/#{params[:job_id]}/log.txt")
 
-          if params[:cors_hax]
-            status 204
-            headers['Access-Control-Expose-Headers'] = 'Location'
-            headers['Location'] = archived_log_path
+            if params[:cors_hax]
+              status 204
+              headers['Access-Control-Expose-Headers'] = 'Location'
+              headers['Location'] = archived_log_path
+            else
+              redirect archived_log_path, 307
+            end
           else
-            redirect archived_log_path, 307
+            status 406
           end
         else
           respond_with resource
diff --git a/lib/travis/api/app/helpers/accept.rb b/lib/travis/api/app/helpers/accept.rb
index a57dfa8e..229f544e 100644
--- a/lib/travis/api/app/helpers/accept.rb
+++ b/lib/travis/api/app/helpers/accept.rb
@@ -64,6 +64,10 @@ class Travis::Api::App
         end
       end
 
+      def accepts?(mime_type)
+        accept_entries.any? { |e| e.accepts?(mime_type) }
+      end
+
       def accept_entries
         entries = env['HTTP_ACCEPT'].to_s.delete(' ').to_s.split(',').map { |e| Entry.new(e) }
         entries.empty? ? [Entry.new('*/*')] : entries.sort
diff --git a/spec/integration/v2/jobs_spec.rb b/spec/integration/v2/jobs_spec.rb
index 13be7a25..1183d619 100644
--- a/spec/integration/v2/jobs_spec.rb
+++ b/spec/integration/v2/jobs_spec.rb
@@ -28,6 +28,7 @@ describe 'Jobs' do
     context 'when log is archived' do
       it 'redirects to archive' do
         job.log.update_attributes!(content: 'the log', archived_at: Time.now, archive_verified: true)
+        headers = { 'HTTP_ACCEPT' => 'text/plain; version=2' }
         response = get "/jobs/#{job.id}/log.txt", {}, headers
         response.should redirect_to("https://s3.amazonaws.com/archive.travis-ci.org/jobs/#{job.id}/log.txt")
       end
@@ -36,6 +37,7 @@ describe 'Jobs' do
     context 'when log is missing' do
       it 'redirects to archive' do
         job.log.destroy
+        headers = { 'HTTP_ACCEPT' => 'text/plain; version=2' }
         response = get "/jobs/#{job.id}/log.txt", {}, headers
         response.should redirect_to("https://s3.amazonaws.com/archive.travis-ci.org/jobs/#{job.id}/log.txt")
       end
@@ -44,6 +46,7 @@ describe 'Jobs' do
     context 'with cors_hax param' do
       it 'renders No Content response with location of the archived log' do
         job.log.destroy
+        headers = { 'HTTP_ACCEPT' => 'text/plain; version=2' }
         response = get "/jobs/#{job.id}/log.txt?cors_hax=true", {}, headers
         response.status.should == 204
         response.headers['Location'].should == "https://s3.amazonaws.com/archive.travis-ci.org/jobs/#{job.id}/log.txt"
@@ -76,8 +79,10 @@ describe 'Jobs' do
       end
 
       it 'responds with 406 when log is already aggregated' do
-        job.log.update_attributes(aggregated_at: Time.now)
-        headers = { 'HTTP_ACCEPT' => 'application/vnd.travis-ci.2+json; chunked=true' }
+        job.log.update_attributes(aggregated_at: Time.now, archived_at: Time.now, archive_verified: true)
+        job.log.should be_archived
+
+        headers = { 'HTTP_ACCEPT' => 'application/json; version=2; chunked=true' }
         response = get "/jobs/#{job.id}/log", {}, headers
         response.status.should == 406
       end

From 4341461bd3be05b654753aa55f70d6b52aab43d3 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Thu, 25 Sep 2014 13:04:44 +0200
Subject: [PATCH 16/70] Don't use nginx

---
 .buildpacks           |  1 -
 Procfile              |  2 +-
 config/nginx.conf.erb | 43 -------------------------------------------
 script/server         |  2 +-
 4 files changed, 2 insertions(+), 46 deletions(-)
 delete mode 100644 config/nginx.conf.erb

diff --git a/.buildpacks b/.buildpacks
index 36201cad..eb20a5d0 100644
--- a/.buildpacks
+++ b/.buildpacks
@@ -1,3 +1,2 @@
 https://github.com/heroku/heroku-buildpack-ruby.git
 https://github.com/drogus/last-commit-sha-buildpack.git
-https://github.com/ryandotsmith/nginx-buildpack.git
diff --git a/Procfile b/Procfile
index 42675c0c..bbb53736 100644
--- a/Procfile
+++ b/Procfile
@@ -1,2 +1,2 @@
-web: bin/start-nginx bundle exec ./script/server
+web: bundle exec ./script/server
 console: bundle exec ./script/console
diff --git a/config/nginx.conf.erb b/config/nginx.conf.erb
deleted file mode 100644
index b901bab8..00000000
--- a/config/nginx.conf.erb
+++ /dev/null
@@ -1,43 +0,0 @@
-daemon off;
-#Heroku dynos have 4 cores.
-worker_processes 4;
-
-events {
-  use epoll;
-  accept_mutex on;
-  worker_connections 1024;
-}
-
-http {
-        gzip on;
-        gzip_comp_level 2;
-        gzip_min_length 512;
-
-  log_format l2met 'measure.nginx.service=$request_time request_id=$http_heroku_request_id';
-  access_log logs/nginx/access.log l2met;
-  error_log logs/nginx/error.log;
-
-  include mime.types;
-  default_type application/octet-stream;
-  sendfile on;
-
-  #Must read the body in 5 seconds.
-  client_body_timeout 5;
-
-  upstream app_server {
-    server unix:/tmp/nginx.socket fail_timeout=0;
-  }
-
-  server {
-    listen <%= ENV["PORT"] %>;
-    server_name _;
-    keepalive_timeout 5;
-
-    location / {
-      proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-      proxy_set_header Host $http_host;
-      proxy_redirect off;
-      proxy_pass http://app_server;
-    }
-  }
-}
diff --git a/script/server b/script/server
index 3c88cd81..01320b42 100755
--- a/script/server
+++ b/script/server
@@ -3,6 +3,6 @@ cd "$(dirname "$0")/.."
 [ $PORT ]     || PORT=3000
 [ $RACK_ENV ] || RACK_ENV=development
 
-cmd="ruby -I lib -S bundle exec ruby -I lib -S unicorn config.ru -E $RACK_ENV -c config/unicorn.rb"
+cmd="ruby -I lib -S bundle exec ruby -I lib -S unicorn config.ru -p $PORT -E $RACK_ENV -c config/unicorn.rb"
 [[ $RACK_ENV == "development" ]] && exec rerun "$cmd -l 127.0.0.1:$PORT"
 exec $cmd

From c2fc97b138b523410e0dcdf949ad456797bac832 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Tue, 30 Sep 2014 12:12:05 +0200
Subject: [PATCH 17/70] Return tag along with commit

---
 lib/travis/api/v2/http/build.rb      | 1 +
 lib/travis/api/v2/http/builds.rb     | 1 +
 lib/travis/api/v2/http/job.rb        | 1 +
 lib/travis/api/v2/http/jobs.rb       | 1 +
 spec/unit/api/v2/http/build_spec.rb  | 1 +
 spec/unit/api/v2/http/builds_spec.rb | 1 +
 spec/unit/api/v2/http/job_spec.rb    | 1 +
 spec/unit/api/v2/http/jobs_spec.rb   | 1 +
 8 files changed, 8 insertions(+)

diff --git a/lib/travis/api/v2/http/build.rb b/lib/travis/api/v2/http/build.rb
index bb79e78c..df97cb37 100644
--- a/lib/travis/api/v2/http/build.rb
+++ b/lib/travis/api/v2/http/build.rb
@@ -48,6 +48,7 @@ module Travis
                 'id' => commit.id,
                 'sha' => commit.commit,
                 'branch' => commit.branch,
+                'tag'    => commit.tag,
                 'message' => commit.message,
                 'committed_at' => format_date(commit.committed_at),
                 'author_name' => commit.author_name,
diff --git a/lib/travis/api/v2/http/builds.rb b/lib/travis/api/v2/http/builds.rb
index 1c640cd2..8d86a936 100644
--- a/lib/travis/api/v2/http/builds.rb
+++ b/lib/travis/api/v2/http/builds.rb
@@ -49,6 +49,7 @@ module Travis
                 'id' => commit.id,
                 'sha' => commit.commit,
                 'branch' => commit.branch,
+                'tag' => commit.tag,
                 'message' => commit.message,
                 'committed_at' => format_date(commit.committed_at),
                 'author_name' => commit.author_name,
diff --git a/lib/travis/api/v2/http/job.rb b/lib/travis/api/v2/http/job.rb
index 4b712b40..6a624c37 100644
--- a/lib/travis/api/v2/http/job.rb
+++ b/lib/travis/api/v2/http/job.rb
@@ -47,6 +47,7 @@ module Travis
                 'id' => commit.id,
                 'sha' => commit.commit,
                 'branch' => commit.branch,
+                'tag' => commit.tag,
                 'message' => commit.message,
                 'committed_at' => format_date(commit.committed_at),
                 'author_name' => commit.author_name,
diff --git a/lib/travis/api/v2/http/jobs.rb b/lib/travis/api/v2/http/jobs.rb
index c27bd08e..b4f1eb68 100644
--- a/lib/travis/api/v2/http/jobs.rb
+++ b/lib/travis/api/v2/http/jobs.rb
@@ -45,6 +45,7 @@ module Travis
                 'id' => commit.id,
                 'sha' => commit.commit,
                 'branch' => commit.branch,
+                'tag' => commit.tag,
                 'message' => commit.message,
                 'committed_at' => format_date(commit.committed_at),
                 'author_name' => commit.author_name,
diff --git a/spec/unit/api/v2/http/build_spec.rb b/spec/unit/api/v2/http/build_spec.rb
index c7e6751c..9968c3eb 100644
--- a/spec/unit/api/v2/http/build_spec.rb
+++ b/spec/unit/api/v2/http/build_spec.rb
@@ -28,6 +28,7 @@ describe Travis::Api::V2::Http::Build do
       'id' => 1,
       'sha' => '62aae5f70ceee39123ef',
       'branch' => 'master',
+      'tag' => nil,
       'message' => 'the commit message',
       'compare_url' => 'https://github.com/svenfuchs/minimal/compare/master...develop',
       'committed_at' => json_format_time(Time.now.utc - 1.hour),
diff --git a/spec/unit/api/v2/http/builds_spec.rb b/spec/unit/api/v2/http/builds_spec.rb
index ef332c50..19f526af 100644
--- a/spec/unit/api/v2/http/builds_spec.rb
+++ b/spec/unit/api/v2/http/builds_spec.rb
@@ -28,6 +28,7 @@ describe Travis::Api::V2::Http::Builds do
       'id' => commit.id,
       'sha' => '62aae5f70ceee39123ef',
       'branch' => 'master',
+      'tag' => nil,
       'message' => 'the commit message',
       'compare_url' => 'https://github.com/svenfuchs/minimal/compare/master...develop',
       'committed_at' => json_format_time(Time.now.utc - 1.hour),
diff --git a/spec/unit/api/v2/http/job_spec.rb b/spec/unit/api/v2/http/job_spec.rb
index a9211b6f..32ea9bb9 100644
--- a/spec/unit/api/v2/http/job_spec.rb
+++ b/spec/unit/api/v2/http/job_spec.rb
@@ -31,6 +31,7 @@ describe Travis::Api::V2::Http::Job do
       'sha' => '62aae5f70ceee39123ef',
       'message' => 'the commit message',
       'branch' => 'master',
+      'tag' => nil,
       'message' => 'the commit message',
       'committed_at' => json_format_time(Time.now.utc - 1.hour),
       'committer_name' => 'Sven Fuchs',
diff --git a/spec/unit/api/v2/http/jobs_spec.rb b/spec/unit/api/v2/http/jobs_spec.rb
index 4a084973..3dfb9f5d 100644
--- a/spec/unit/api/v2/http/jobs_spec.rb
+++ b/spec/unit/api/v2/http/jobs_spec.rb
@@ -30,6 +30,7 @@ describe Travis::Api::V2::Http::Jobs do
       'sha' => '62aae5f70ceee39123ef',
       'message' => 'the commit message',
       'branch' => 'master',
+      'tag' => nil,
       'message' => 'the commit message',
       'committed_at' => json_format_time(Time.now.utc - 1.hour),
       'committer_name' => 'Sven Fuchs',

From 21485d8851eedc57205b0263d730d935c03ac982 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Wed, 1 Oct 2014 15:22:45 +0200
Subject: [PATCH 18/70] Bump travis-core

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index a9b9c803..9b2f7430 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -37,7 +37,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-core.git
-  revision: c33c0d40306e2493d4b65ca00be6731a4e614bed
+  revision: aed9d2ff3a1890d652cc48b1823038c69f5ca395
   specs:
     travis-core (0.0.1)
       actionmailer (~> 3.2.19)

From dd239b86d03eb92dbb78ca881409a82830db3746 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Wed, 1 Oct 2014 20:39:50 +0200
Subject: [PATCH 19/70] Respond with 404 if job doesn't have a repository

We have some jobs which doesn't have any repository in our DB. This is a
quick fix which returns 404 for such a request instead of raising an
error
---
 lib/travis/api/app/endpoint/jobs.rb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/travis/api/app/endpoint/jobs.rb b/lib/travis/api/app/endpoint/jobs.rb
index 302112e0..9a70becf 100644
--- a/lib/travis/api/app/endpoint/jobs.rb
+++ b/lib/travis/api/app/endpoint/jobs.rb
@@ -12,7 +12,14 @@ class Travis::Api::App
       end
 
       get '/:id' do
-        respond_with service(:find_job, params)
+        job = service(:find_job, params).run
+        if job && job.repository
+          respond_with job
+        else
+          json = { error: { message: "The job(#{params[:id]}) couldn't be found" } }
+          status 404
+          respond_with json
+        end
       end
 
       post '/:id/cancel' do

From 1701ea009329afe6f7e65a77005a2e2985b28bb0 Mon Sep 17 00:00:00 2001
From: Sven Fuchs <me@svenfuchs.com>
Date: Mon, 6 Oct 2014 16:42:14 +0200
Subject: [PATCH 20/70] use travis-[core|support]/master-2014-10-06

---
 Gemfile      | 4 ++--
 Gemfile.lock | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 49579f5c..9b90c46d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,8 +3,8 @@ ruby '2.1.2'
 source 'https://rubygems.org'
 gemspec
 
-gem 'travis-core',     github: 'travis-ci/travis-core'
-gem 'travis-support',  github: 'travis-ci/travis-support'
+gem 'travis-core',     github: 'travis-ci/travis-core', ref: 'master-2014-10-06'
+gem 'travis-support',  github: 'travis-ci/travis-support', ref: 'master-2014-10-06'
 gem 'travis-sidekiqs', github: 'travis-ci/travis-sidekiqs', require: nil, ref: 'cde9741'
 gem 'travis-yaml',     github: 'travis-ci/travis-yaml'
 gem 'sinatra'
diff --git a/Gemfile.lock b/Gemfile.lock
index 9b2f7430..ca52feb0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -37,7 +37,8 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-core.git
-  revision: aed9d2ff3a1890d652cc48b1823038c69f5ca395
+  revision: 93b4779b1e5cb0c1211bf095856eb21ccc655423
+  ref: master-2014-10-06
   specs:
     travis-core (0.0.1)
       actionmailer (~> 3.2.19)
@@ -68,7 +69,8 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-support.git
-  revision: 178e30d2976ce773b9cf8d5ee3c07c19b97bfb55
+  revision: a3af474254c8d2a5c829ce4be11ca53941361974
+  ref: master-2014-10-06
   specs:
     travis-support (0.0.1)
 

From 9a4b2b8e998b43e6b206fa154bf71f53ac1f6b83 Mon Sep 17 00:00:00 2001
From: Sven Fuchs <me@svenfuchs.com>
Date: Mon, 19 Aug 2013 17:49:39 +0200
Subject: [PATCH 21/70] allow whitelisting target_origin in Travis.config

---
 Gemfile.lock                                 | 3 +--
 lib/travis/api/app/endpoint/authorization.rb | 8 +++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index ca52feb0..32bd5a4c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -37,8 +37,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-core.git
-  revision: 93b4779b1e5cb0c1211bf095856eb21ccc655423
-  ref: master-2014-10-06
+  revision: 35f690bfb12bb0bef90297783e7c7ab15048dfc0
   specs:
     travis-core (0.0.1)
       actionmailer (~> 3.2.19)
diff --git a/lib/travis/api/app/endpoint/authorization.rb b/lib/travis/api/app/endpoint/authorization.rb
index 5733959d..82e4176b 100644
--- a/lib/travis/api/app/endpoint/authorization.rb
+++ b/lib/travis/api/app/endpoint/authorization.rb
@@ -324,7 +324,9 @@ class Travis::Api::App
 
         def target_ok?(target_origin)
           return unless uri = Addressable::URI.parse(target_origin)
-          if uri.host =~ /\A(.+\.)?travis-ci\.(com|org)\Z/
+          if allowed_https_targets.include?(uri.host)
+            uri.scheme == 'https'
+          elsif uri.host =~ /\A(.+\.)?travis-ci\.(com|org)\Z/
             uri.scheme == 'https'
           elsif uri.host =~ /\A(.+\.)?travis-lite\.com\Z/
             uri.scheme == 'https'
@@ -332,6 +334,10 @@ class Travis::Api::App
             uri.port > 1023
           end
         end
+
+        def allowed_https_targets
+          @allowed_https_targets ||= Travis.config.auth.api.target_origin.split(',')
+        end
     end
   end
 end

From 7eebcff341e071dadb62d9b94627efeaeabbeee3 Mon Sep 17 00:00:00 2001
From: Sven Fuchs <me@svenfuchs.com>
Date: Tue, 20 Aug 2013 12:47:06 +0200
Subject: [PATCH 22/70] check for sentry.dsn

---
 lib/travis/api/app.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/travis/api/app.rb b/lib/travis/api/app.rb
index 15668ec9..3cd6de53 100644
--- a/lib/travis/api/app.rb
+++ b/lib/travis/api/app.rb
@@ -180,7 +180,7 @@ module Travis::Api
       def self.setup_monitoring
         Raven.configure do |config|
           config.dsn = Travis.config.sentry.dsn
-        end if Travis.config.sentry
+        end if Travis.config.sentry.dsn
 
         Travis::LogSubscriber::ActiveRecordMetrics.attach
         Travis::Notification.setup(instrumentation: false)

From 8cfbe642a0d92f0ae71acb195eae7950d54f38c5 Mon Sep 17 00:00:00 2001
From: Sven Fuchs <me@svenfuchs.com>
Date: Tue, 20 Aug 2013 12:50:07 +0200
Subject: [PATCH 23/70] to_s target_origin config to be safe

---
 lib/travis/api/app/endpoint/authorization.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/travis/api/app/endpoint/authorization.rb b/lib/travis/api/app/endpoint/authorization.rb
index 82e4176b..c8c54fee 100644
--- a/lib/travis/api/app/endpoint/authorization.rb
+++ b/lib/travis/api/app/endpoint/authorization.rb
@@ -336,7 +336,7 @@ class Travis::Api::App
         end
 
         def allowed_https_targets
-          @allowed_https_targets ||= Travis.config.auth.api.target_origin.split(',')
+          @allowed_https_targets ||= Travis.config.auth.target_origin.to_s.split(',')
         end
     end
   end

From 1080bee23b4532de4ea6712a2a8850b66379bbf3 Mon Sep 17 00:00:00 2001
From: Sven Fuchs <me@svenfuchs.com>
Date: Thu, 22 Aug 2013 13:00:30 +0200
Subject: [PATCH 24/70] do not include Raven::Rack unless configured

---
 lib/travis/api/app.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/travis/api/app.rb b/lib/travis/api/app.rb
index 3cd6de53..c490e4a0 100644
--- a/lib/travis/api/app.rb
+++ b/lib/travis/api/app.rb
@@ -87,8 +87,8 @@ module Travis::Api
           [ 420, {}, ['Enhance Your Calm']]
         end
 
-        use Travis::Api::App::Cors
-        use Raven::Rack if Endpoint.production?
+        use Travis::Api::App::Cors # if Travis.env == 'development' ???
+        use Raven::Rack if Endpoint.production? && Travis.config.sentry.dsn
         use Rack::Protection::PathTraversal
         use Rack::SSL if Endpoint.production?
         use ActiveRecord::ConnectionAdapters::ConnectionManagement

From f3a2cc2f40c9c91488386674c5eb250b29cb4030 Mon Sep 17 00:00:00 2001
From: Sven Fuchs <me@svenfuchs.com>
Date: Fri, 30 Aug 2013 17:11:08 +0200
Subject: [PATCH 25/70] use Travis.config.github.ssl when fetching an oauth
 access token

---
 lib/travis/api/app/endpoint/authorization.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/travis/api/app/endpoint/authorization.rb b/lib/travis/api/app/endpoint/authorization.rb
index c8c54fee..9745f467 100644
--- a/lib/travis/api/app/endpoint/authorization.rb
+++ b/lib/travis/api/app/endpoint/authorization.rb
@@ -276,7 +276,7 @@ class Travis::Api::App
         end
 
         def get_token(endoint, values)
-          response   = Faraday.post(endoint, values)
+          response   = Faraday.new(ssl: Travis.config.github.ssl).post(endoint, values)
           parameters = Addressable::URI.form_unencode(response.body)
           token_info = parameters.assoc("access_token")
           halt 401, 'could not resolve github token' unless token_info

From b024945cdea3b7e61753c3af80f4dc5e4b73d731 Mon Sep 17 00:00:00 2001
From: Konstantin Haase <konstantin.mailinglists@googlemail.com>
Date: Fri, 30 Aug 2013 18:42:13 +0200
Subject: [PATCH 26/70] check Travis.config.client_domain

---
 lib/travis/api/app/endpoint/home.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/travis/api/app/endpoint/home.rb b/lib/travis/api/app/endpoint/home.rb
index b98956f5..1db26e1f 100644
--- a/lib/travis/api/app/endpoint/home.rb
+++ b/lib/travis/api/app/endpoint/home.rb
@@ -3,6 +3,10 @@ require 'travis/api/app'
 class Travis::Api::App
   class Endpoint
     class Home < Endpoint
+      unless Travis.config.client_domain or test?
+        fail "Travis.config.client_domain is not set"
+      end
+
       set :prefix, '/'
       set :client_config,
         host: Travis.config.client_domain,

From b8d700ea65fa33b5208566fc13df0e82cb1db2df Mon Sep 17 00:00:00 2001
From: Konstantin Haase <konstantin.mailinglists@googlemail.com>
Date: Tue, 3 Sep 2013 18:22:31 +0200
Subject: [PATCH 27/70] expose more pusher infos

---
 lib/travis/api/app/endpoint/home.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/travis/api/app/endpoint/home.rb b/lib/travis/api/app/endpoint/home.rb
index 1db26e1f..de1386d8 100644
--- a/lib/travis/api/app/endpoint/home.rb
+++ b/lib/travis/api/app/endpoint/home.rb
@@ -12,7 +12,7 @@ class Travis::Api::App
         host: Travis.config.client_domain,
         shorten_host: Travis.config.shorten_host,
         assets: Travis.config.assets,
-        pusher: { key: Travis.config.pusher.try(:key) },
+        pusher: (Travis.config.pusher || {}).to_hash.slice(:host, :port, :scheme, :key),
         github: { api_url: GH.current.api_host.to_s, scopes: Travis.config.oauth2.try(:scope).to_s.split(?,) }
 
       # Landing point. Redirects web browsers to [API documentation](#/docs/).

From 2b6f2ceabed43bf5d0bbd79b7a8a148884d8c72e Mon Sep 17 00:00:00 2001
From: Konstantin Haase <konstantin.mailinglists@googlemail.com>
Date: Tue, 3 Sep 2013 23:35:38 +0200
Subject: [PATCH 28/70] be smarter about host setting

---
 lib/travis/api/app/endpoint/home.rb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/travis/api/app/endpoint/home.rb b/lib/travis/api/app/endpoint/home.rb
index de1386d8..a0e1af5f 100644
--- a/lib/travis/api/app/endpoint/home.rb
+++ b/lib/travis/api/app/endpoint/home.rb
@@ -3,13 +3,12 @@ require 'travis/api/app'
 class Travis::Api::App
   class Endpoint
     class Home < Endpoint
-      unless Travis.config.client_domain or test?
-        fail "Travis.config.client_domain is not set"
-      end
+      host = Travis.config.client_domain || Travis.config.host
+      fail "Travis.config.client_domain is not set" unless host or test?
 
       set :prefix, '/'
       set :client_config,
-        host: Travis.config.client_domain,
+        host: host,
         shorten_host: Travis.config.shorten_host,
         assets: Travis.config.assets,
         pusher: (Travis.config.pusher || {}).to_hash.slice(:host, :port, :scheme, :key),

From bda2797f0e9e47f6fa2d9454ae2e61b6259d3c29 Mon Sep 17 00:00:00 2001
From: Sven Fuchs <me@svenfuchs.com>
Date: Mon, 16 Sep 2013 16:43:03 +0200
Subject: [PATCH 29/70] bump core and support. Travis::Metrics.setup

---
 Gemfile               |  4 ++--
 Gemfile.lock          | 28 ++++++++++++++++------------
 lib/travis/api/app.rb |  2 ++
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/Gemfile b/Gemfile
index 9b90c46d..9e0172f6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,8 +3,8 @@ ruby '2.1.2'
 source 'https://rubygems.org'
 gemspec
 
-gem 'travis-core',     github: 'travis-ci/travis-core', ref: 'master-2014-10-06'
-gem 'travis-support',  github: 'travis-ci/travis-support', ref: 'master-2014-10-06'
+gem 'travis-core',     github: 'travis-ci/travis-core', branch: 'sf-te'
+gem 'travis-support',  github: 'travis-ci/travis-support', branch: 'sf-te'
 gem 'travis-sidekiqs', github: 'travis-ci/travis-sidekiqs', require: nil, ref: 'cde9741'
 gem 'travis-yaml',     github: 'travis-ci/travis-yaml'
 gem 'sinatra'
diff --git a/Gemfile.lock b/Gemfile.lock
index 32bd5a4c..49c765e0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -37,7 +37,8 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-core.git
-  revision: 35f690bfb12bb0bef90297783e7c7ab15048dfc0
+  revision: 89b65f97ef0ffd00dd36ba38645034c8bcc0e250
+  branch: sf-te
   specs:
     travis-core (0.0.1)
       actionmailer (~> 3.2.19)
@@ -48,8 +49,8 @@ GIT
       hashr (~> 0.0.19)
       metriks (~> 0.9.7)
       multi_json
-      pusher (~> 0.11.0)
-      railties (~> 3.2.19)
+      pusher (~> 0.12.0)
+      railties (~> 3.2.12)
       rake
       redis (~> 3.0)
       rollout (~> 1.1.0)
@@ -68,8 +69,8 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-support.git
-  revision: a3af474254c8d2a5c829ce4be11ca53941361974
-  ref: master-2014-10-06
+  revision: 243147664e49a168b0c2d3c40c04a786bf664f37
+  branch: sf-te
   specs:
     travis-support (0.0.1)
 
@@ -183,9 +184,9 @@ GEM
     hashie (3.1.0)
     hashr (0.0.22)
     hike (1.2.3)
-    hitimes (1.2.2)
-    i18n (0.6.11)
-    ice_nine (0.11.0)
+    hitimes (1.2.1)
+    httpclient (2.3.4.1)
+    i18n (0.6.5)
     journey (1.0.4)
     json (1.8.1)
     kgio (2.9.2)
@@ -206,9 +207,9 @@ GEM
     mime-types (1.25.1)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
-    multi_json (1.10.1)
-    multipart-post (2.0.0)
-    net-http-persistent (2.9.4)
+    multi_json (1.8.0)
+    multipart-post (1.2.0)
+    net-http-persistent (2.9)
     net-http-pipeline (1.0.1)
     pg (0.13.2)
     polyglot (0.3.5)
@@ -217,7 +218,10 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pusher (0.11.3)
+    puma (2.3.1)
+      rack (>= 1.1, < 2.0)
+    pusher (0.12.0)
+      httpclient (~> 2.3.0)
       multi_json (~> 1.0)
       signature (~> 0.1.6)
     rack (1.4.5)
diff --git a/lib/travis/api/app.rb b/lib/travis/api/app.rb
index c490e4a0..018bafdd 100644
--- a/lib/travis/api/app.rb
+++ b/lib/travis/api/app.rb
@@ -185,6 +185,8 @@ module Travis::Api
         Travis::LogSubscriber::ActiveRecordMetrics.attach
         Travis::Notification.setup(instrumentation: false)
 
+        # Travis::Metrics.setup from sf-te, does this conflict with the setup below?
+
         if Travis.config.librato
           email, token, source = Travis.config.librato.email,
                                          Travis.config.librato.token,

From c3f93b789b4959322d67bcb341f8074a96ba9a71 Mon Sep 17 00:00:00 2001
From: Sven Fuchs <me@svenfuchs.com>
Date: Tue, 22 Oct 2013 01:48:33 +0200
Subject: [PATCH 30/70] add repos stats script

---
 script/repos_stats.rb | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 script/repos_stats.rb

diff --git a/script/repos_stats.rb b/script/repos_stats.rb
new file mode 100644
index 00000000..0a1bead3
--- /dev/null
+++ b/script/repos_stats.rb
@@ -0,0 +1,26 @@
+$stdout.sync = true
+
+Repository.where('last_build_finished_at is not null').count(group: :github_language)
+
+rates = Repository.where('last_build_finished_at is not null').count(group: [:last_build_state, :github_language])
+groups = rates.group_by { |k, v| k[1] }
+stats = groups.map do |lang, values|
+  values.inject({ "language" => lang || 'unknown' }) do |result, (state, count)|
+    result.merge(state[0] => count)
+  end
+end
+
+keys = %w(language total passed failed errored cancelled)
+puts keys.join(',')
+
+rows = stats.map do |stat|
+  values = stat.values
+  row = [values.shift]
+  row << stat.values[1..-1].inject(&:+)
+  keys[1..-1].each { |key| row << (stat[key] || 0) }
+  row
+end
+
+rows = rows.sort_by { |row| row[1] }.reverse
+csv = rows.map { |row| row.join(',') }
+puts csv.join("\n")

From be719b1253e36a5dac22a547bdb1eeef7cbb2e28 Mon Sep 17 00:00:00 2001
From: Sven Fuchs <me@svenfuchs.com>
Date: Tue, 22 Oct 2013 14:48:49 +0200
Subject: [PATCH 31/70] use http_x_script_name header if given

---
 lib/travis/api/app.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/travis/api/app.rb b/lib/travis/api/app.rb
index 018bafdd..fe27d134 100644
--- a/lib/travis/api/app.rb
+++ b/lib/travis/api/app.rb
@@ -106,6 +106,7 @@ module Travis::Api
         use Rack::JSONP
 
         use Rack::Config do |env|
+          env['SCRIPT_NAME'] = env['HTTP_X_SCRIPT_NAME'].to_s + env['SCRIPT_NAME'].to_s
           env['travis.global_prefix'] = env['SCRIPT_NAME']
         end
 

From 185244f0e7899a4d168d3c0b9ac4ba796af235ec Mon Sep 17 00:00:00 2001
From: Sven Fuchs <me@svenfuchs.com>
Date: Wed, 23 Oct 2013 23:49:53 +0200
Subject: [PATCH 32/70] favor Travis.config.pusher_ws over
 Travis.config.pusher, add the pusher_ws path

---
 lib/travis/api/app/endpoint/home.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/travis/api/app/endpoint/home.rb b/lib/travis/api/app/endpoint/home.rb
index a0e1af5f..bb3b3eb7 100644
--- a/lib/travis/api/app/endpoint/home.rb
+++ b/lib/travis/api/app/endpoint/home.rb
@@ -11,7 +11,7 @@ class Travis::Api::App
         host: host,
         shorten_host: Travis.config.shorten_host,
         assets: Travis.config.assets,
-        pusher: (Travis.config.pusher || {}).to_hash.slice(:host, :port, :scheme, :key),
+        pusher: (Travis.config.pusher_ws || Travis.config.pusher || {}).to_hash.slice(:scheme, :host, :port, :path, :key),
         github: { api_url: GH.current.api_host.to_s, scopes: Travis.config.oauth2.try(:scope).to_s.split(?,) }
 
       # Landing point. Redirects web browsers to [API documentation](#/docs/).

From f383a2e1b328d2d21e714d5835afbf43d983996d Mon Sep 17 00:00:00 2001
From: Sven Fuchs <me@svenfuchs.com>
Date: Tue, 3 Dec 2013 16:16:21 +0100
Subject: [PATCH 33/70] allow disabling the 3rd party cookies check

---
 lib/travis/api/app/endpoint/authorization.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/travis/api/app/endpoint/authorization.rb b/lib/travis/api/app/endpoint/authorization.rb
index 9745f467..6e2a7aa5 100644
--- a/lib/travis/api/app/endpoint/authorization.rb
+++ b/lib/travis/api/app/endpoint/authorization.rb
@@ -128,7 +128,8 @@ class Travis::Api::App
       # token is being received.
       get '/post_message', scope: :public do
         content_type :html
-        erb :container
+        data = { check_third_party_cookies: !Travis.config.auth.disable_third_party_cookies_check }
+        erb(:container, locals: data)
       end
 
       get '/post_message/iframe', scope: :public do
@@ -382,6 +383,7 @@ function main() {
 var url = window.location.pathname + '/iframe' + window.location.search;
 
 function thirdPartyCookies(yes, no) {
+  <%= "return no();" unless check_third_party_cookies %>
   window.cookiesCheckCallback = function(enabled) { enabled ? yes() : no() };
   var img      = document.createElement('img');
   img.src      = "https://third-party-cookies.herokuapp.com/set";

From 4a0bdaafe68c1aa2179c1834562f21f36ca58673 Mon Sep 17 00:00:00 2001
From: Sven Fuchs <me@svenfuchs.com>
Date: Fri, 20 Jun 2014 23:57:43 +0200
Subject: [PATCH 34/70] make touching /tmp/app-initialized depend on heroku env
 var

---
 lib/travis/api/app.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/travis/api/app.rb b/lib/travis/api/app.rb
index fe27d134..81b883c7 100644
--- a/lib/travis/api/app.rb
+++ b/lib/travis/api/app.rb
@@ -55,7 +55,7 @@ module Travis::Api
     def self.setup(options = {})
       setup! unless setup?
       Endpoint.set(options) if options
-      FileUtils.touch('/tmp/app-initialized')
+      FileUtils.touch('/tmp/app-initialized') if ENV['DYNO'] # Heroku
     end
 
     def self.new(options = {})

From 58ce449ca4d08b57b2d6ed516939f8117de2e75f Mon Sep 17 00:00:00 2001
From: Sven Fuchs <me@svenfuchs.com>
Date: Sat, 21 Jun 2014 15:54:11 +0200
Subject: [PATCH 35/70] fix specs for rspec

---
 spec/integration/settings_endpoint_spec.rb    |  4 ++--
 spec/integration/v2/hooks_spec.rb             |  2 +-
 spec/integration/v2/settings/env_vars_spec.rb |  7 ++++---
 spec/spec_helper.rb                           |  2 +-
 spec/unit/api/v2/http/build_spec.rb           |  2 +-
 spec/unit/api/v2/http/builds_spec.rb          |  2 +-
 spec/unit/endpoint/authorization_spec.rb      |  4 ++--
 spec/unit/endpoint/users_spec.rb              |  2 +-
 spec/unit/helpers/accept_spec.rb              | 14 +++++++-------
 spec/unit/responders/json_spec.rb             |  6 +++---
 10 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/spec/integration/settings_endpoint_spec.rb b/spec/integration/settings_endpoint_spec.rb
index b53f2ca6..86d2a942 100644
--- a/spec/integration/settings_endpoint_spec.rb
+++ b/spec/integration/settings_endpoint_spec.rb
@@ -69,7 +69,7 @@ describe Travis::Api::App::SettingsEndpoint do
 
         response = get '/settings/items', { repository_id: repo.id }, headers
         json = JSON.parse(response.body)
-        json['items'].should have(1).items
+        json['items'].length.should == 1
         item = json['items'].first
         item['name'].should == 'an item'
         item['id'].should_not be_nil
@@ -165,7 +165,7 @@ describe Travis::Api::App::SettingsEndpoint do
         json['item']['id'].should == item.id
         json['item'].should_not have_key('secret')
 
-        repo.reload.settings.items.should have(0).items
+        repo.reload.settings.items.length.should == 0
       end
 
       it 'returns 404 if item can\'t be found' do
diff --git a/spec/integration/v2/hooks_spec.rb b/spec/integration/v2/hooks_spec.rb
index c0a685de..29bfa977 100644
--- a/spec/integration/v2/hooks_spec.rb
+++ b/spec/integration/v2/hooks_spec.rb
@@ -37,7 +37,7 @@ describe 'Hooks' do
       GH.stubs(:[]).returns([])
       GH.expects(:post).with(target, payload).returns(GH.load(PAYLOADS[:github][:hook_active]))
       response = put 'hooks', { hook: { id: hook.id, active: 'true' } }, headers
-      repo.reload.active?.should be_true
+      repo.reload.active?.should == true
       response.should be_successful
     end
   end
diff --git a/spec/integration/v2/settings/env_vars_spec.rb b/spec/integration/v2/settings/env_vars_spec.rb
index c7e2d789..ece91049 100644
--- a/spec/integration/v2/settings/env_vars_spec.rb
+++ b/spec/integration/v2/settings/env_vars_spec.rb
@@ -21,7 +21,7 @@ describe Travis::Api::App::SettingsEndpoint do
         json = JSON.parse(response.body)
         json['env_var']['name'].should == 'FOO'
         json['env_var']['id'].should == record.id
-        json['env_var']['public'].should be_false
+        json['env_var']['public'].should == false
         json['env_var']['repository_id'].should == repo.id
         json['env_var'].should_not have_key('value')
       end
@@ -47,7 +47,8 @@ describe Travis::Api::App::SettingsEndpoint do
         key['name'].should == 'FOO'
         key['id'].should == record.id
         key['repository_id'].should == repo.id
-        key['public'].should be_false
+
+        key['public'].should == false
         key.should_not have_key('value')
       end
     end
@@ -165,7 +166,7 @@ describe Travis::Api::App::SettingsEndpoint do
         json['env_var']['id'].should == env_var.id
         json['env_var'].should_not have_key('value')
 
-        repo.reload.settings.env_vars.should have(0).env_vars
+        repo.reload.settings.env_vars.length.should == 0
       end
 
       it 'returns 404 if env_var can\'t be found' do
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 508b6333..e41dbdf2 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -50,7 +50,7 @@ end
 
 RSpec.configure do |c|
   c.mock_framework = :mocha
-  c.expect_with :rspec, :stdlib
+  c.expect_with :rspec, :test_unit
   c.include TestHelpers
 
   c.before :suite do
diff --git a/spec/unit/api/v2/http/build_spec.rb b/spec/unit/api/v2/http/build_spec.rb
index 9968c3eb..5107c667 100644
--- a/spec/unit/api/v2/http/build_spec.rb
+++ b/spec/unit/api/v2/http/build_spec.rb
@@ -49,7 +49,7 @@ describe Travis::Api::V2::Http::Build do
     let(:data) { Travis::Api::V2::Http::Build.new(build).data }
 
     it 'returns pull request data' do
-      data['build']['pull_request'].should be_true
+      data['build']['pull_request'].should == true
       data['build']['pull_request_title'].should == 'A pull request'
       data['build']['pull_request_number'].should == 44
     end
diff --git a/spec/unit/api/v2/http/builds_spec.rb b/spec/unit/api/v2/http/builds_spec.rb
index 19f526af..b59f7998 100644
--- a/spec/unit/api/v2/http/builds_spec.rb
+++ b/spec/unit/api/v2/http/builds_spec.rb
@@ -56,7 +56,7 @@ describe Travis::Api::V2::Http::Builds do
     end
 
     it 'returns pull request data' do
-      data['builds'].first['pull_request'].should be_true
+      data['builds'].first['pull_request'].should == true
       data['builds'].first['pull_request_number'].should == 44
     end
   end
diff --git a/spec/unit/endpoint/authorization_spec.rb b/spec/unit/endpoint/authorization_spec.rb
index ad8ae799..e2cc59d1 100644
--- a/spec/unit/endpoint/authorization_spec.rb
+++ b/spec/unit/endpoint/authorization_spec.rb
@@ -30,11 +30,11 @@ describe Travis::Api::App::Endpoint::Authorization do
   end
 
   describe 'GET /auth/authorize' do
-    pending "not yet implemented"
+    skip "not yet implemented"
   end
 
   describe 'POST /auth/access_token' do
-    pending "not yet implemented"
+    skip "not yet implemented"
   end
 
   describe "GET /auth/handshake" do
diff --git a/spec/unit/endpoint/users_spec.rb b/spec/unit/endpoint/users_spec.rb
index 46e0ff7e..bbd776cf 100644
--- a/spec/unit/endpoint/users_spec.rb
+++ b/spec/unit/endpoint/users_spec.rb
@@ -40,7 +40,7 @@ describe Travis::Api::App::Endpoint::Users do
         response = post('/users/sync', { access_token: access_token.to_s }, 'HTTP_ACCEPT' => 'application/vnd.travis-ci.2+json, */*; q=0.01')
 
         response.status.should == 409
-        JSON.parse(response.body).should be_true
+        JSON.parse(response.body).should == { 'message' => 'Sync already in progress. Try again later.' }
       end
     end
   end
diff --git a/spec/unit/helpers/accept_spec.rb b/spec/unit/helpers/accept_spec.rb
index cd41d0d3..6c32ef87 100644
--- a/spec/unit/helpers/accept_spec.rb
+++ b/spec/unit/helpers/accept_spec.rb
@@ -47,23 +47,23 @@ module Travis::Api::App::Helpers
       describe 'accepts?' do
         it 'accepts everything with */* type' do
           entry = Accept::Entry.new('*/*')
-          entry.accepts?('application/json').should be_true
-          entry.accepts?('foo/bar').should be_true
+          entry.accepts?('application/json').should == true
+          entry.accepts?('foo/bar').should == true
         end
 
         it 'accepts every subtype with application/* type' do
           entry = Accept::Entry.new('application/*')
 
-          entry.accepts?('application/foo').should be_true
-          entry.accepts?('application/bar').should be_true
-          entry.accepts?('text/plain').should be_false
+          entry.accepts?('application/foo').should == true
+          entry.accepts?('application/bar').should == true
+          entry.accepts?('text/plain').should == false
         end
 
         it 'accepts when type and subtype match' do
           entry = Accept::Entry.new('application/json')
 
-          entry.accepts?('application/json').should be_true
-          entry.accepts?('application/xml').should be_false
+          entry.accepts?('application/json').should == true
+          entry.accepts?('application/xml').should == false
         end
       end
     end
diff --git a/spec/unit/responders/json_spec.rb b/spec/unit/responders/json_spec.rb
index 5b43bbc1..c6b934d1 100644
--- a/spec/unit/responders/json_spec.rb
+++ b/spec/unit/responders/json_spec.rb
@@ -14,7 +14,7 @@ module Travis::Api::App::Responders
 
     context 'with resource not associated with Api data class' do
       it 'returns nil result' do
-        json.apply.should be_false
+        json.apply.should be_nil
       end
     end
 
@@ -31,8 +31,8 @@ module Travis::Api::App::Responders
         let(:resource) { nil }
 
         it 'responds with 404' do
-          json.apply?.should be_false
-          json.apply.should be_false
+          json.apply?.should be_falsey
+          json.apply.should be_falsey
         end
       end
     end

From 7643a253fa9e985f72b3513553242b1a261ac6a9 Mon Sep 17 00:00:00 2001
From: Sven Fuchs <me@svenfuchs.com>
Date: Sat, 21 Jun 2014 16:26:38 +0200
Subject: [PATCH 36/70] notes about failing spec in auth handshake

---
 lib/travis/api/app/endpoint/authorization.rb | 4 ++--
 spec/unit/endpoint/authorization_spec.rb     | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/travis/api/app/endpoint/authorization.rb b/lib/travis/api/app/endpoint/authorization.rb
index 6e2a7aa5..65ed8573 100644
--- a/lib/travis/api/app/endpoint/authorization.rb
+++ b/lib/travis/api/app/endpoint/authorization.rb
@@ -276,8 +276,8 @@ class Travis::Api::App
           user
         end
 
-        def get_token(endoint, values)
-          response   = Faraday.new(ssl: Travis.config.github.ssl).post(endoint, values)
+        def get_token(endpoint, values)
+          response   = Faraday.new(ssl: Travis.config.github.ssl).post(endpoint, values)
           parameters = Addressable::URI.form_unencode(response.body)
           token_info = parameters.assoc("access_token")
           halt 401, 'could not resolve github token' unless token_info
diff --git a/spec/unit/endpoint/authorization_spec.rb b/spec/unit/endpoint/authorization_spec.rb
index e2cc59d1..33c76e84 100644
--- a/spec/unit/endpoint/authorization_spec.rb
+++ b/spec/unit/endpoint/authorization_spec.rb
@@ -75,6 +75,8 @@ describe Travis::Api::App::Endpoint::Authorization do
         User::Oauth.instance_variable_set("@wanted_scopes", nil)
       end
 
+      # in endpoint/authorization.rb 271, get_token faraday raises the exception:
+      # hostname "foobar.com" does not match the server certificate
       it 'redirects to insufficient access page' do
         response = get '/auth/handshake?state=github-state&code=oauth-code'
         response.should redirect_to('https://travis-ci.org/insufficient_access')

From dcb52596942b047a342d08c3bd4578bc31fb9b1a Mon Sep 17 00:00:00 2001
From: Sven Fuchs <me@svenfuchs.com>
Date: Sun, 22 Jun 2014 22:32:30 +0200
Subject: [PATCH 37/70] try fixing db setup for travis

---
 .travis.yml |  3 +-
 Rakefile    | 99 ++++++++++++++++++++++++++++++++++++++++++++++-------
 2 files changed, 87 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6a25506e..a624509a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,8 +8,7 @@ rvm:
 addons:
   postgresql: 9.3
 before_script:
-  # create 'logs' table matching 'travis-logs'
-  - 'RAILS_ENV=test bundle exec rake db:create db:structure:load mv_migrations db:migrate --trace'
+  - 'RAILS_ENV=test bundle exec rake db:create db:migrate --trace'
 
 notifications:
   irc: "irc.freenode.org#travis"
diff --git a/Rakefile b/Rakefile
index cc2ec531..866a2958 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,8 +1,9 @@
 require 'bundler/setup'
-CORE_PATH = Gem.loaded_specs['travis-core'].full_gem_path
-ENV['DB_STRUCTURE'] = "#{CORE_PATH}/db/structure.sql"
+require 'travis'
+require 'travis/engine'
 
 begin
+  ENV['SCHEMA'] = File.expand_path('../db/schema.rb', $:.detect { |p| p.include?('travis-core') })
   require 'micro_migrations'
 rescue LoadError
   # we can't load micro migrations on production
@@ -17,17 +18,6 @@ rescue LoadError
   warn "could not load rspec"
 end
 
-desc "move travis-core-specific migrations to db/migrate"
-task 'mv_migrations' do
-  require 'fileutils'
-  migration_files = Dir["#{CORE_PATH}/spec/migrations/**/*.rb"]
-  migration_files.each do |f|
-    dest = 'db/migrate'
-    FileUtils.mkdir_p dest
-    FileUtils.cp f, dest
-  end
-end
-
 desc "generate gemspec"
 task 'travis-api.gemspec' do
   content = File.read 'travis-api.gemspec'
@@ -52,3 +42,86 @@ task default: 'travis-api.gemspec'
 
 tasks_path = File.expand_path('../lib/tasks/*.rake', __FILE__)
 Dir.glob(tasks_path).each { |r| import r }
+
+module ActiveRecord
+  class Migration
+    class << self
+      attr_accessor :disable_ddl_transaction
+    end
+
+    # Disable DDL transactions for this migration.
+    def self.disable_ddl_transaction!
+      @disable_ddl_transaction = true
+    end
+
+    def disable_ddl_transaction # :nodoc:
+      self.class.disable_ddl_transaction
+    end
+  end
+
+  class Migrator
+    def use_transaction?(migration)
+      !migration.disable_ddl_transaction && Base.connection.supports_ddl_transactions?
+    end
+
+    def ddl_transaction(migration, &block)
+      if use_transaction?(migration)
+        Base.transaction { block.call }
+      else
+        block.call
+      end
+    end
+
+    def migrate(&block)
+      current = migrations.detect { |m| m.version == current_version }
+      target = migrations.detect { |m| m.version == @target_version }
+
+      if target.nil? && @target_version && @target_version > 0
+        raise UnknownMigrationVersionError.new(@target_version)
+      end
+
+      start = up? ? 0 : (migrations.index(current) || 0)
+      finish = migrations.index(target) || migrations.size - 1
+      runnable = migrations[start..finish]
+
+      # skip the last migration if we're headed down, but not ALL the way down
+      runnable.pop if down? && target
+
+      ran = []
+      runnable.each do |migration|
+        if block && !block.call(migration)
+          next
+        end
+
+        Base.logger.info "Migrating to #{migration.name} (#{migration.version})" if Base.logger
+
+        seen = migrated.include?(migration.version.to_i)
+
+        # On our way up, we skip migrating the ones we've already migrated
+        next if up? && seen
+
+        # On our way down, we skip reverting the ones we've never migrated
+        if down? && !seen
+          migration.announce 'never migrated, skipping'; migration.write
+          next
+        end
+
+        begin
+          ddl_transaction(migration) do
+            migration.migrate(@direction)
+            record_version_state_after_migrating(migration.version)
+          end
+          ran << migration
+        rescue => e
+          canceled_msg = Base.connection.supports_ddl_transactions? ? "this and " : ""
+          raise StandardError, "An error has occurred, #{canceled_msg}all later migrations canceled:\n\n#{e}", e.backtrace
+        end
+      end
+      ran
+    end
+  end
+
+  class MigrationProxy
+    delegate :disable_ddl_transaction, to: :migration
+  end
+end

From 1905070c1d2eeb2d2379a4bcca9afe6b5b21fb85 Mon Sep 17 00:00:00 2001
From: Sven Fuchs <me@svenfuchs.com>
Date: Sat, 21 Jun 2014 15:54:18 +0200
Subject: [PATCH 38/70] bump deps

---
 Gemfile      |   2 +-
 Gemfile.lock | 100 ++++++++++++++++++++++++++++-----------------------
 2 files changed, 56 insertions(+), 46 deletions(-)

diff --git a/Gemfile b/Gemfile
index 9e0172f6..c9454d04 100644
--- a/Gemfile
+++ b/Gemfile
@@ -23,6 +23,7 @@ gem 'dalli'
 gem 'pry'
 gem 'metriks',         '0.9.9.6'
 gem 'metriks-librato_metrics', github: 'eric/metriks-librato_metrics'
+gem 'micro_migrations'
 
 group :test do
   gem 'rspec',         '~> 2.13'
@@ -39,5 +40,4 @@ end
 
 group :development, :test do
   gem 'rake', '~> 0.9.2'
-  gem 'micro_migrations', git: 'https://gist.github.com/4269321.git'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 49c765e0..8f2e54ee 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -7,16 +7,15 @@ GIT
 
 GIT
   remote: git://github.com/getsentry/raven-ruby.git
-  revision: 8e63d48823a60b7d591932582b6e3ee3678fea60
+  revision: bd026531c390a7fbc71980871a7951bc0f2d737f
   specs:
-    sentry-raven (0.9.3)
+    sentry-raven (0.10.1)
       faraday (>= 0.7.6)
-      hashie (>= 1.1.0)
       uuidtools
 
 GIT
   remote: git://github.com/rack/rack-contrib.git
-  revision: 5c12ace4ba2b9e4802e4d948a8ee0114da18760b
+  revision: 1b11346d729efd88b274cd7f704e0bca9eb3de7a
   specs:
     rack-contrib (1.2.0)
       rack (>= 0.9.1)
@@ -37,7 +36,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-core.git
-  revision: 89b65f97ef0ffd00dd36ba38645034c8bcc0e250
+  revision: 1311a3642023e0ae19a77f4015d4c67f968420d3
   branch: sf-te
   specs:
     travis-core (0.0.1)
@@ -50,7 +49,7 @@ GIT
       metriks (~> 0.9.7)
       multi_json
       pusher (~> 0.12.0)
-      railties (~> 3.2.12)
+      railties (~> 3.2.19)
       rake
       redis (~> 3.0)
       rollout (~> 1.1.0)
@@ -69,23 +68,17 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-support.git
-  revision: 243147664e49a168b0c2d3c40c04a786bf664f37
+  revision: fed35c671074eb78784a2beee3d1e5fd0dfd2620
   branch: sf-te
   specs:
     travis-support (0.0.1)
 
 GIT
   remote: git://github.com/travis-ci/travis-yaml.git
-  revision: 6b10f1e5f8b32c760ac41d93ee4cc3bd714c8e5d
+  revision: 121678eba7280b8269a73c56953cafd20e884bdc
   specs:
     travis-yaml (0.1.0)
 
-GIT
-  remote: https://gist.github.com/4269321.git
-  revision: 8e2d21b924a69dd48191df6a18e51769f5a88614
-  specs:
-    micro_migrations (0.0.1)
-
 PATH
   remote: .
   specs:
@@ -105,7 +98,6 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (2.2.8)
     actionmailer (3.2.19)
       actionpack (= 3.2.19)
       mail (~> 2.5.4)
@@ -119,8 +111,8 @@ GEM
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    active_model_serializers (0.8.1)
-      activemodel (>= 3.0)
+    active_model_serializers (0.9.0)
+      activemodel (>= 3.2)
     activemodel (3.2.19)
       activesupport (= 3.2.19)
       builder (~> 3.0.0)
@@ -143,13 +135,25 @@ GEM
     backports (2.8.2)
     builder (3.0.4)
     bunny (0.8.0)
-    celluloid (0.12.4)
-      facter (>= 1.6.12)
+    celluloid (0.12.0)
       timers (>= 1.0.0)
+    chunky_png (1.3.1)
     coder (0.4.0)
     coderay (1.1.0)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
+    compass (1.0.1)
+      chunky_png (~> 1.2)
+      compass-core (~> 1.0.1)
+      compass-import-once (~> 1.0.5)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+      sass (>= 3.3.13, < 3.5)
+    compass-core (1.0.1)
+      multi_json (~> 1.0)
+      sass (>= 3.3.0, < 3.5)
+    compass-import-once (1.0.5)
+      sass (>= 3.2, < 3.5)
     connection_pool (0.9.3)
     daemons (1.1.9)
     dalli (2.7.2)
@@ -164,13 +168,11 @@ GEM
     equalizer (0.0.9)
     erubis (2.7.0)
     eventmachine (1.0.3)
-    facter (2.1.0)
-      CFPropertyList (~> 2.2.6)
     factory_girl (2.4.2)
       activesupport
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.3)
+    ffi (1.9.5)
     foreman (0.64.0)
       dotenv (~> 0.7.0)
       thor (>= 0.13.6)
@@ -181,12 +183,12 @@ GEM
       multi_json (~> 1.0)
       net-http-persistent (>= 2.7)
       net-http-pipeline
-    hashie (3.1.0)
     hashr (0.0.22)
     hike (1.2.3)
-    hitimes (1.2.1)
+    hitimes (1.2.2)
     httpclient (2.3.4.1)
-    i18n (0.6.5)
+    i18n (0.6.11)
+    ice_nine (0.11.0)
     journey (1.0.4)
     json (1.8.1)
     kgio (2.9.2)
@@ -204,28 +206,29 @@ GEM
       atomic (~> 1.0)
       avl_tree (~> 1.1.2)
       hitimes (~> 1.1)
+    micro_migrations (0.0.2)
+      activerecord
+      railties
     mime-types (1.25.1)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
-    multi_json (1.8.0)
-    multipart-post (1.2.0)
-    net-http-persistent (2.9)
+    multi_json (1.10.1)
+    multipart-post (2.0.0)
+    net-http-persistent (2.9.4)
     net-http-pipeline (1.0.1)
     pg (0.13.2)
     polyglot (0.3.5)
     proxies (0.2.1)
-    pry (0.10.0)
+    pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    puma (2.3.1)
-      rack (>= 1.1, < 2.0)
     pusher (0.12.0)
       httpclient (~> 2.3.0)
       multi_json (~> 1.0)
       signature (~> 0.1.6)
     rack (1.4.5)
-    rack-attack (4.1.0)
+    rack-attack (4.1.1)
       rack
     rack-protection (1.5.3)
       rack
@@ -251,7 +254,7 @@ GEM
       json (~> 1.4)
     redcarpet (2.3.0)
     redis (3.1.0)
-    redis-namespace (1.5.0)
+    redis-namespace (1.5.1)
       redis (~> 3.0, >= 3.0.4)
     rerun (0.8.2)
       listen (~> 1.0.3)
@@ -260,18 +263,22 @@ GEM
       rspec-core (~> 2.99.0)
       rspec-expectations (~> 2.99.0)
       rspec-mocks (~> 2.99.0)
-    rspec-core (2.99.1)
-    rspec-expectations (2.99.1)
+    rspec-core (2.99.2)
+    rspec-expectations (2.99.2)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.99.1)
+    rspec-mocks (2.99.2)
     s3 (0.3.21)
       proxies (~> 0.2.0)
-    sidekiq (2.5.4)
+    sass (3.4.5)
+    sidekiq (2.5.0)
       celluloid (~> 0.12.0)
+      compass
       connection_pool (~> 0.9.2)
       multi_json (~> 1)
       redis (~> 3)
       redis-namespace
+      sass
+      sprockets-sass
     signature (0.1.7)
     simple_states (1.0.1)
       activesupport
@@ -287,20 +294,23 @@ GEM
       rack-test
       sinatra (~> 1.4.0)
       tilt (~> 1.3)
-    slop (3.5.0)
+    slop (3.6.0)
     sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    thin (1.6.2)
-      daemons (>= 1.0.9)
-      eventmachine (>= 1.0.0)
-      rack (>= 1.0.0)
+    sprockets-sass (1.2.0)
+      sprockets (~> 2.0)
+      tilt (~> 1.1)
+    thin (1.6.3)
+      daemons (~> 1.0, >= 1.0.9)
+      eventmachine (~> 1.0)
+      rack (~> 1.0)
     thor (0.14.6)
     thread_safe (0.3.4)
     tilt (1.4.1)
-    timers (3.0.1)
+    timers (4.0.1)
       hitimes
     treetop (1.4.15)
       polyglot
@@ -310,7 +320,7 @@ GEM
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
-    uuidtools (2.1.4)
+    uuidtools (2.1.5)
     virtus (1.0.3)
       axiom-types (~> 0.1)
       coercible (~> 1.0)
@@ -331,7 +341,7 @@ DEPENDENCIES
   gh
   metriks (= 0.9.9.6)
   metriks-librato_metrics!
-  micro_migrations!
+  micro_migrations
   mocha (~> 0.12)
   pry
   rack-attack

From e053a786c05b4ce2a7e9536d770176ad66eb8a9e Mon Sep 17 00:00:00 2001
From: Sven Fuchs <me@svenfuchs.com>
Date: Tue, 7 Oct 2014 16:58:36 +0200
Subject: [PATCH 39/70] Revert "Return tag along with commit"

This reverts commit c2fc97b138b523410e0dcdf949ad456797bac832.

The respective change in travis-core was reverted meanwhile:
https://github.com/travis-ci/travis-core/commit/95d59342e9d76ea43345acefcb5a6b3be8263ad0
---
 lib/travis/api/v2/http/build.rb      | 1 -
 lib/travis/api/v2/http/builds.rb     | 1 -
 lib/travis/api/v2/http/job.rb        | 1 -
 lib/travis/api/v2/http/jobs.rb       | 1 -
 spec/unit/api/v2/http/build_spec.rb  | 1 -
 spec/unit/api/v2/http/builds_spec.rb | 1 -
 spec/unit/api/v2/http/job_spec.rb    | 1 -
 spec/unit/api/v2/http/jobs_spec.rb   | 1 -
 8 files changed, 8 deletions(-)

diff --git a/lib/travis/api/v2/http/build.rb b/lib/travis/api/v2/http/build.rb
index df97cb37..bb79e78c 100644
--- a/lib/travis/api/v2/http/build.rb
+++ b/lib/travis/api/v2/http/build.rb
@@ -48,7 +48,6 @@ module Travis
                 'id' => commit.id,
                 'sha' => commit.commit,
                 'branch' => commit.branch,
-                'tag'    => commit.tag,
                 'message' => commit.message,
                 'committed_at' => format_date(commit.committed_at),
                 'author_name' => commit.author_name,
diff --git a/lib/travis/api/v2/http/builds.rb b/lib/travis/api/v2/http/builds.rb
index 8d86a936..1c640cd2 100644
--- a/lib/travis/api/v2/http/builds.rb
+++ b/lib/travis/api/v2/http/builds.rb
@@ -49,7 +49,6 @@ module Travis
                 'id' => commit.id,
                 'sha' => commit.commit,
                 'branch' => commit.branch,
-                'tag' => commit.tag,
                 'message' => commit.message,
                 'committed_at' => format_date(commit.committed_at),
                 'author_name' => commit.author_name,
diff --git a/lib/travis/api/v2/http/job.rb b/lib/travis/api/v2/http/job.rb
index 6a624c37..4b712b40 100644
--- a/lib/travis/api/v2/http/job.rb
+++ b/lib/travis/api/v2/http/job.rb
@@ -47,7 +47,6 @@ module Travis
                 'id' => commit.id,
                 'sha' => commit.commit,
                 'branch' => commit.branch,
-                'tag' => commit.tag,
                 'message' => commit.message,
                 'committed_at' => format_date(commit.committed_at),
                 'author_name' => commit.author_name,
diff --git a/lib/travis/api/v2/http/jobs.rb b/lib/travis/api/v2/http/jobs.rb
index b4f1eb68..c27bd08e 100644
--- a/lib/travis/api/v2/http/jobs.rb
+++ b/lib/travis/api/v2/http/jobs.rb
@@ -45,7 +45,6 @@ module Travis
                 'id' => commit.id,
                 'sha' => commit.commit,
                 'branch' => commit.branch,
-                'tag' => commit.tag,
                 'message' => commit.message,
                 'committed_at' => format_date(commit.committed_at),
                 'author_name' => commit.author_name,
diff --git a/spec/unit/api/v2/http/build_spec.rb b/spec/unit/api/v2/http/build_spec.rb
index 5107c667..a7ed68d8 100644
--- a/spec/unit/api/v2/http/build_spec.rb
+++ b/spec/unit/api/v2/http/build_spec.rb
@@ -28,7 +28,6 @@ describe Travis::Api::V2::Http::Build do
       'id' => 1,
       'sha' => '62aae5f70ceee39123ef',
       'branch' => 'master',
-      'tag' => nil,
       'message' => 'the commit message',
       'compare_url' => 'https://github.com/svenfuchs/minimal/compare/master...develop',
       'committed_at' => json_format_time(Time.now.utc - 1.hour),
diff --git a/spec/unit/api/v2/http/builds_spec.rb b/spec/unit/api/v2/http/builds_spec.rb
index b59f7998..73c98378 100644
--- a/spec/unit/api/v2/http/builds_spec.rb
+++ b/spec/unit/api/v2/http/builds_spec.rb
@@ -28,7 +28,6 @@ describe Travis::Api::V2::Http::Builds do
       'id' => commit.id,
       'sha' => '62aae5f70ceee39123ef',
       'branch' => 'master',
-      'tag' => nil,
       'message' => 'the commit message',
       'compare_url' => 'https://github.com/svenfuchs/minimal/compare/master...develop',
       'committed_at' => json_format_time(Time.now.utc - 1.hour),
diff --git a/spec/unit/api/v2/http/job_spec.rb b/spec/unit/api/v2/http/job_spec.rb
index 32ea9bb9..a9211b6f 100644
--- a/spec/unit/api/v2/http/job_spec.rb
+++ b/spec/unit/api/v2/http/job_spec.rb
@@ -31,7 +31,6 @@ describe Travis::Api::V2::Http::Job do
       'sha' => '62aae5f70ceee39123ef',
       'message' => 'the commit message',
       'branch' => 'master',
-      'tag' => nil,
       'message' => 'the commit message',
       'committed_at' => json_format_time(Time.now.utc - 1.hour),
       'committer_name' => 'Sven Fuchs',
diff --git a/spec/unit/api/v2/http/jobs_spec.rb b/spec/unit/api/v2/http/jobs_spec.rb
index 3dfb9f5d..4a084973 100644
--- a/spec/unit/api/v2/http/jobs_spec.rb
+++ b/spec/unit/api/v2/http/jobs_spec.rb
@@ -30,7 +30,6 @@ describe Travis::Api::V2::Http::Jobs do
       'sha' => '62aae5f70ceee39123ef',
       'message' => 'the commit message',
       'branch' => 'master',
-      'tag' => nil,
       'message' => 'the commit message',
       'committed_at' => json_format_time(Time.now.utc - 1.hour),
       'committer_name' => 'Sven Fuchs',

From 2b333771b4b3f50d30b223a26e3fc4bb7725c98a Mon Sep 17 00:00:00 2001
From: Sven Fuchs <me@svenfuchs.com>
Date: Tue, 7 Oct 2014 17:23:02 +0200
Subject: [PATCH 40/70] use sudo: false

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index a624509a..fbca476d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,4 @@
+sudo: false
 language: ruby
 env:
   global:

From 193c749cd12e733117b35c15f10f53b07b325419 Mon Sep 17 00:00:00 2001
From: Sven Fuchs <me@svenfuchs.com>
Date: Tue, 7 Oct 2014 18:39:24 +0200
Subject: [PATCH 41/70] fix settings env var api specs

---
 spec/integration/v2/settings/env_vars_spec.rb | 17 ++++++++++++-----
 spec/unit/api/v2/http/env_var_spec.rb         |  6 +++---
 spec/unit/endpoint/authorization_spec.rb      |  6 ++++--
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/spec/integration/v2/settings/env_vars_spec.rb b/spec/integration/v2/settings/env_vars_spec.rb
index ece91049..c7427211 100644
--- a/spec/integration/v2/settings/env_vars_spec.rb
+++ b/spec/integration/v2/settings/env_vars_spec.rb
@@ -23,7 +23,10 @@ describe Travis::Api::App::SettingsEndpoint do
         json['env_var']['id'].should == record.id
         json['env_var']['public'].should == false
         json['env_var']['repository_id'].should == repo.id
-        json['env_var'].should_not have_key('value')
+
+        # TODO not sure why this has changed, and if it is harmful. the settings UI looks correct to me on staging
+        # json['env_var'].should_not have_key('value')
+        json['env_var']['value'].should be_nil
       end
 
       it 'returns 404 if env var can\'t be found' do
@@ -49,7 +52,8 @@ describe Travis::Api::App::SettingsEndpoint do
         key['repository_id'].should == repo.id
 
         key['public'].should == false
-        key.should_not have_key('value')
+        # key.should_not have_key('value')
+        key['value'].should be_nil
       end
     end
 
@@ -60,7 +64,8 @@ describe Travis::Api::App::SettingsEndpoint do
         json = JSON.parse(response.body)
         json['env_var']['name'].should == 'FOO'
         json['env_var']['id'].should_not be_nil
-        json['env_var'].should_not have_key('value')
+        # json['env_var'].should_not have_key('value')
+        json['env_var']['value'].should be_nil
 
         env_var = repo.reload.settings.env_vars.first
         env_var.id.should_not be_nil
@@ -122,7 +127,8 @@ describe Travis::Api::App::SettingsEndpoint do
         json = JSON.parse(response.body)
         json['env_var']['name'].should == 'FOO'
         json['env_var']['id'].should == env_var.id
-        json['env_var'].should_not have_key('value')
+        # json['env_var'].should_not have_key('value')
+        json['env_var']['value'].should be_nil
 
         updated_env_var = repo.reload.settings.env_vars.find(env_var.id)
         updated_env_var.id.should == env_var.id
@@ -164,7 +170,8 @@ describe Travis::Api::App::SettingsEndpoint do
         json = JSON.parse(response.body)
         json['env_var']['name'].should == 'FOO'
         json['env_var']['id'].should == env_var.id
-        json['env_var'].should_not have_key('value')
+        # json['env_var'].should_not have_key('value')
+        json['env_var']['value'].should be_nil
 
         repo.reload.settings.env_vars.length.should == 0
       end
diff --git a/spec/unit/api/v2/http/env_var_spec.rb b/spec/unit/api/v2/http/env_var_spec.rb
index 20f69863..8f9e703e 100644
--- a/spec/unit/api/v2/http/env_var_spec.rb
+++ b/spec/unit/api/v2/http/env_var_spec.rb
@@ -5,7 +5,7 @@ describe Travis::Api::V2::Http::EnvVar do
   let(:data) { Travis::Api::V2::Http::EnvVar.new(env_var) }
 
   it 'returns value' do
-    data.as_json[:env_var][:value].should == 'bar'
+    data.as_json['env_var'][:value].should == 'bar'
   end
 
   describe 'private' do
@@ -13,8 +13,8 @@ describe Travis::Api::V2::Http::EnvVar do
 
     it "doesn't return the value" do
       data.to_json.should_not include('bar')
-      data.as_json[:env_var].should_not have_key(:value)
-      data.as_json[:env_var].should_not have_key('value')
+      data.as_json['env_var']['value'].should be_nil
+      data.as_json['env_var'][:value].should be_nil
     end
   end
 end
diff --git a/spec/unit/endpoint/authorization_spec.rb b/spec/unit/endpoint/authorization_spec.rb
index 33c76e84..424e3d59 100644
--- a/spec/unit/endpoint/authorization_spec.rb
+++ b/spec/unit/endpoint/authorization_spec.rb
@@ -77,12 +77,14 @@ describe Travis::Api::App::Endpoint::Authorization do
 
       # in endpoint/authorization.rb 271, get_token faraday raises the exception:
       # hostname "foobar.com" does not match the server certificate
-      it 'redirects to insufficient access page' do
+      # TODO disabling this as per @rkh's advice
+      xit 'redirects to insufficient access page' do
         response = get '/auth/handshake?state=github-state&code=oauth-code'
         response.should redirect_to('https://travis-ci.org/insufficient_access')
       end
 
-      it 'redirects to insufficient access page for existing user' do
+      # TODO disabling this as per @rkh's advice
+      xit 'redirects to insufficient access page for existing user' do
         user = mock('user')
         User.expects(:find_by_github_id).with(111).returns(user)
         expect {

From 1e89e9fdcdfd722aaaec0cbc089ceb06d7909aef Mon Sep 17 00:00:00 2001
From: Sven Fuchs <me@svenfuchs.com>
Date: Tue, 7 Oct 2014 19:41:09 +0200
Subject: [PATCH 42/70] use travis-core and support master

---
 Gemfile      | 4 ++--
 Gemfile.lock | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index c9454d04..5c0652f9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,8 +3,8 @@ ruby '2.1.2'
 source 'https://rubygems.org'
 gemspec
 
-gem 'travis-core',     github: 'travis-ci/travis-core', branch: 'sf-te'
-gem 'travis-support',  github: 'travis-ci/travis-support', branch: 'sf-te'
+gem 'travis-core',     github: 'travis-ci/travis-core'
+gem 'travis-support',  github: 'travis-ci/travis-support'
 gem 'travis-sidekiqs', github: 'travis-ci/travis-sidekiqs', require: nil, ref: 'cde9741'
 gem 'travis-yaml',     github: 'travis-ci/travis-yaml'
 gem 'sinatra'
diff --git a/Gemfile.lock b/Gemfile.lock
index 8f2e54ee..5748e3ef 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -36,8 +36,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-core.git
-  revision: 1311a3642023e0ae19a77f4015d4c67f968420d3
-  branch: sf-te
+  revision: e3c099055098586eb168f8b3d2af2f28c1fdcb74
   specs:
     travis-core (0.0.1)
       actionmailer (~> 3.2.19)
@@ -68,8 +67,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-support.git
-  revision: fed35c671074eb78784a2beee3d1e5fd0dfd2620
-  branch: sf-te
+  revision: 033d9b993d4c8b08af8d86a725ee34539cf0b979
   specs:
     travis-support (0.0.1)
 

From 48664d6263e5fbc6b3d645b979fcde84313b2039 Mon Sep 17 00:00:00 2001
From: Sven Fuchs <me@svenfuchs.com>
Date: Sun, 12 Oct 2014 15:15:26 +0200
Subject: [PATCH 43/70] use Travis::Metrics.setup

---
 lib/travis/api/app.rb | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/lib/travis/api/app.rb b/lib/travis/api/app.rb
index 81b883c7..46b2ad93 100644
--- a/lib/travis/api/app.rb
+++ b/lib/travis/api/app.rb
@@ -185,16 +185,7 @@ module Travis::Api
 
         Travis::LogSubscriber::ActiveRecordMetrics.attach
         Travis::Notification.setup(instrumentation: false)
-
-        # Travis::Metrics.setup from sf-te, does this conflict with the setup below?
-
-        if Travis.config.librato
-          email, token, source = Travis.config.librato.email,
-                                         Travis.config.librato.token,
-                                         Travis.config.librato_source
-          on_error = proc {|ex| puts "librato error: #{ex.message} (#{ex.response.body})"}
-          Metriks::LibratoMetricsReporter.new(email, token, source: source, on_error: on_error).start
-        end
+        Travis::Metrics.setup
       end
 
       def self.load_endpoints

From bc791f6b825b8533dff66457a6ac4a11fa6a4c39 Mon Sep 17 00:00:00 2001
From: Sven Fuchs <me@svenfuchs.com>
Date: Sun, 12 Oct 2014 16:41:46 +0200
Subject: [PATCH 44/70] bump travis-support

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 5748e3ef..8bb6d604 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -67,7 +67,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-support.git
-  revision: 033d9b993d4c8b08af8d86a725ee34539cf0b979
+  revision: 352419335e9b78cf087dbd8523879498d6177db4
   specs:
     travis-support (0.0.1)
 

From f5abbdd33a4a3ac51b8add2624d7cc27caabc6b4 Mon Sep 17 00:00:00 2001
From: Sven Fuchs <me@svenfuchs.com>
Date: Sun, 12 Oct 2014 17:06:50 +0200
Subject: [PATCH 45/70] bump travis-core

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 8bb6d604..09992aff 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -36,7 +36,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-core.git
-  revision: e3c099055098586eb168f8b3d2af2f28c1fdcb74
+  revision: 68c49a7d74f92a004cda8aa20f17261ace9ddf05
   specs:
     travis-core (0.0.1)
       actionmailer (~> 3.2.19)

From 58b5d8d03adddd8122617059e99183b206824fe0 Mon Sep 17 00:00:00 2001
From: Sven Fuchs <me@svenfuchs.com>
Date: Sun, 19 Oct 2014 17:13:12 +0200
Subject: [PATCH 46/70] use travis-config rubygem

---
 Gemfile      | 3 ++-
 Gemfile.lock | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 5c0652f9..34edea69 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,8 +3,9 @@ ruby '2.1.2'
 source 'https://rubygems.org'
 gemspec
 
-gem 'travis-core',     github: 'travis-ci/travis-core'
+gem 'travis-core',     github: 'travis-ci/travis-core', ref: 'sf-extract-travis-config'
 gem 'travis-support',  github: 'travis-ci/travis-support'
+gem 'travis-config',   '~> 0.1.0'
 gem 'travis-sidekiqs', github: 'travis-ci/travis-sidekiqs', require: nil, ref: 'cde9741'
 gem 'travis-yaml',     github: 'travis-ci/travis-yaml'
 gem 'sinatra'
diff --git a/Gemfile.lock b/Gemfile.lock
index 09992aff..d8d0e83f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -36,7 +36,8 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-core.git
-  revision: 68c49a7d74f92a004cda8aa20f17261ace9ddf05
+  revision: 0312efea8fc67b3a2d3d153acb0a5d28a23e6eff
+  ref: sf-extract-travis-config
   specs:
     travis-core (0.0.1)
       actionmailer (~> 3.2.19)
@@ -55,6 +56,7 @@ GIT
       s3 (~> 0.3)
       simple_states (~> 1.0.0)
       thor (~> 0.14.6)
+      travis-config (~> 0.1.0)
       virtus (~> 1.0.0)
 
 GIT
@@ -310,6 +312,8 @@ GEM
     tilt (1.4.1)
     timers (4.0.1)
       hitimes
+    travis-config (0.1.0)
+      hashr (~> 0.0)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
@@ -353,6 +357,7 @@ DEPENDENCIES
   sinatra
   sinatra-contrib
   travis-api!
+  travis-config (~> 0.1.0)
   travis-core!
   travis-sidekiqs!
   travis-support!

From f1bff9419c9d2e6af84827fb497b128870bac229 Mon Sep 17 00:00:00 2001
From: Sven Fuchs <me@svenfuchs.com>
Date: Sun, 19 Oct 2014 17:43:20 +0200
Subject: [PATCH 47/70] remove travis-core branch

---
 Gemfile      | 2 +-
 Gemfile.lock | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 34edea69..0e4250f8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ ruby '2.1.2'
 source 'https://rubygems.org'
 gemspec
 
-gem 'travis-core',     github: 'travis-ci/travis-core', ref: 'sf-extract-travis-config'
+gem 'travis-core',     github: 'travis-ci/travis-core'
 gem 'travis-support',  github: 'travis-ci/travis-support'
 gem 'travis-config',   '~> 0.1.0'
 gem 'travis-sidekiqs', github: 'travis-ci/travis-sidekiqs', require: nil, ref: 'cde9741'
diff --git a/Gemfile.lock b/Gemfile.lock
index d8d0e83f..1d0c074b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -36,8 +36,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-core.git
-  revision: 0312efea8fc67b3a2d3d153acb0a5d28a23e6eff
-  ref: sf-extract-travis-config
+  revision: c42dd1ccf6340ec1c95c4ec308f057a86be0f6b2
   specs:
     travis-core (0.0.1)
       actionmailer (~> 3.2.19)

From b695c1be7ea191644bde70700620c46eb602de0d Mon Sep 17 00:00:00 2001
From: Sven Fuchs <me@svenfuchs.com>
Date: Sun, 19 Oct 2014 18:21:20 +0200
Subject: [PATCH 48/70] bump travis-core

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 1d0c074b..464628f7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -36,7 +36,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-core.git
-  revision: c42dd1ccf6340ec1c95c4ec308f057a86be0f6b2
+  revision: 0f487381ecf7f06f759116b60a1e9e8544784286
   specs:
     travis-core (0.0.1)
       actionmailer (~> 3.2.19)

From a636e911bd10ca2181a794545f94744737c2275b Mon Sep 17 00:00:00 2001
From: Sven Fuchs <me@svenfuchs.com>
Date: Mon, 20 Oct 2014 15:29:09 +0200
Subject: [PATCH 49/70] Accept build requests via api

---
 lib/travis/api/app/endpoint/requests.rb       | 13 +++--
 .../api/app/services/schedule_request.rb      | 50 +++++++++++++++++
 spec/unit/endpoint/requests_spec.rb           | 55 +++++++++++++++++++
 3 files changed, 114 insertions(+), 4 deletions(-)
 create mode 100644 lib/travis/api/app/services/schedule_request.rb
 create mode 100644 spec/unit/endpoint/requests_spec.rb

diff --git a/lib/travis/api/app/endpoint/requests.rb b/lib/travis/api/app/endpoint/requests.rb
index 4a5b73a0..6b2d94c3 100644
--- a/lib/travis/api/app/endpoint/requests.rb
+++ b/lib/travis/api/app/endpoint/requests.rb
@@ -1,12 +1,17 @@
 require 'travis/api/app'
+require 'travis/api/app/services/schedule_request'
 
 class Travis::Api::App
   class Endpoint
     class Requests < Endpoint
-      # DEPRECATED: this will be removed by 1st of December
-      post '/' do
-        Metriks.meter("api.request.restart").mark
-        respond_with service(:reset_model, params)
+      post '/', scope: :private do
+        if params[:request] && params[:request][:repository]
+          respond_with service(:schedule_request, params[:request])
+        else
+          # DEPRECATED: this will be removed by 1st of December
+          Metriks.meter("api.request.restart").mark
+          respond_with service(:reset_model, params)
+        end
       end
 
       get '/' do
diff --git a/lib/travis/api/app/services/schedule_request.rb b/lib/travis/api/app/services/schedule_request.rb
new file mode 100644
index 00000000..341d968b
--- /dev/null
+++ b/lib/travis/api/app/services/schedule_request.rb
@@ -0,0 +1,50 @@
+require 'multi_json'
+require 'travis/sidekiq/build_request'
+require 'travis/services/base'
+
+class Travis::Api::App
+  module Services
+    class ScheduleRequest < Travis::Services::Base
+      register :schedule_request
+
+      def run
+        repo && active? ? schedule_request : not_found
+      end
+
+      def messages
+        @messages ||= []
+      end
+
+      private
+
+        def schedule_request
+          Metriks.meter('api.request.create').mark
+          Travis::Sidekiq::BuildRequest.perform_async(type: 'api', payload: payload, credentials: {})
+          messages << { notice: 'Build request scheduled.' }
+          true
+        end
+
+        def not_found
+          messages << { error: "Repository #{slug} not found." }
+          false
+        end
+
+        def active?
+          Travis::Features.owner_active?(:request_create, repo.owner)
+        end
+
+        def payload
+          MultiJson.encode(params.merge(user: { id: current_user.id }))
+        end
+
+        def repo
+          @repo ||= Repository.by_slug(slug).first
+        end
+
+        def slug
+          repo = params[:repository] || {}
+          repo.values_at(:owner_name, :name).join('/')
+        end
+    end
+  end
+end
diff --git a/spec/unit/endpoint/requests_spec.rb b/spec/unit/endpoint/requests_spec.rb
new file mode 100644
index 00000000..03ec98f8
--- /dev/null
+++ b/spec/unit/endpoint/requests_spec.rb
@@ -0,0 +1,55 @@
+require 'spec_helper'
+
+describe Travis::Api::App::Endpoint::Requests do
+  include Travis::Testing::Stubs
+
+  let(:token)    { Travis::Api::App::AccessToken.create(user: user, app_id: -1) }
+  let(:data)     { { request: { repository: { owner_name: 'owner', name: 'name' }, branch: 'branch', config: { env: ['FOO=foo'] } } } }
+  let(:headers)  { { 'HTTP_ACCEPT' => 'application/vnd.travis-ci.2+json, */*; q=0.01', 'HTTP_AUTHORIZATION' => %(token "#{token.token}") } }
+  let(:response) { post('/requests', data, headers) }
+
+  before do
+    User.stubs(:find_by_github_id).returns(user)
+    User.stubs(:find).returns(user)
+  end
+
+  describe 'POST to /' do
+    it 'needs to be authenticated' do
+      Travis::Api::App::AccessToken.stubs(:find_by_token).returns(nil)
+      expect(response.status).to eq 403
+    end
+
+    describe 'if the repository does not exist' do
+      it 'returns 404' do
+        expect(response.status).to eq 404
+      end
+
+      it 'includes a notice' do
+        expect(response.body).to eq '{"result":false,"flash":[{"error":"Repository owner/name not found."}]}'
+      end
+    end
+
+    describe 'if successful' do
+      before do
+        Repository.stubs(:by_slug).returns([repo])
+        Travis::Sidekiq::BuildRequest.stubs(:perform_async)
+        Travis::Features.stubs(:owner_active?).returns(true)
+      end
+
+      it 'returns 200' do
+        expect(response.status).to eq 200
+      end
+
+      it 'includes a notice' do
+        expect(response.body).to eq '{"result":true,"flash":[{"notice":"Build request scheduled."}]}'
+      end
+
+      it 'schedules the build request' do
+        payload = MultiJson.encode(data[:request].merge(user: { id: user.id }))
+        Travis::Sidekiq::BuildRequest.expects(:perform_async).with(type: 'api', payload: payload, credentials: {})
+        response
+      end
+    end
+  end
+end
+

From 05494f4acf2405a99d0b1515b51cb0069c271e92 Mon Sep 17 00:00:00 2001
From: Sven Fuchs <me@svenfuchs.com>
Date: Tue, 21 Oct 2014 16:57:44 +0200
Subject: [PATCH 50/70] allow returning a symbol as a result from services, set
 status based on the symbol

---
 lib/travis/api/app/helpers/respond_with.rb      | 16 +++++++++++-----
 lib/travis/api/app/responders/service.rb        |  2 +-
 lib/travis/api/app/services/schedule_request.rb |  4 ++--
 spec/unit/endpoint/requests_spec.rb             |  4 ++--
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/lib/travis/api/app/helpers/respond_with.rb b/lib/travis/api/app/helpers/respond_with.rb
index 55d38ed7..746152fb 100644
--- a/lib/travis/api/app/helpers/respond_with.rb
+++ b/lib/travis/api/app/helpers/respond_with.rb
@@ -8,14 +8,16 @@ class Travis::Api::App
     module RespondWith
       include Accept
 
+      STATUS = {
+        success: 200,
+        not_found: 404
+      }
+
       def respond_with(resource, options = {})
         result = respond(resource, options)
         if result && response.content_type =~ /application\/json/
-          if !params[:pretty].nil? && (params[:pretty].downcase == 'true' || params[:pretty].to_i > 0)
-            result = JSON.pretty_generate(result)
-          else
-            result = result.to_json
-          end
+          status STATUS[result[:result]] if result.is_a?(Hash) && result[:result].is_a?(Symbol)
+          result = prettify_result? ? JSON.pretty_generate(result) : result.to_json
         end
         halt result || 404
       end
@@ -48,6 +50,10 @@ class Travis::Api::App
           response || (resource ? error(406) : error(404))
         end
 
+        def prettify_result?
+          !params[:pretty].nil? && (params[:pretty].downcase == 'true' || params[:pretty].to_i > 0)
+        end
+
         def apply_service_responder(resource, options)
           responder = Responders::Service.new(self, resource, options)
           resource  = responder.apply if responder.apply?
diff --git a/lib/travis/api/app/responders/service.rb b/lib/travis/api/app/responders/service.rb
index 55316b27..57942234 100644
--- a/lib/travis/api/app/responders/service.rb
+++ b/lib/travis/api/app/responders/service.rb
@@ -56,7 +56,7 @@ module Travis::Api
           # If it's nil we also pass it but yield not_found.
           def normalize(result)
             case result
-            when String, true, false
+            when Symbol, String, true, false
               { result: result }
             else
               result
diff --git a/lib/travis/api/app/services/schedule_request.rb b/lib/travis/api/app/services/schedule_request.rb
index 341d968b..80fd9e20 100644
--- a/lib/travis/api/app/services/schedule_request.rb
+++ b/lib/travis/api/app/services/schedule_request.rb
@@ -21,12 +21,12 @@ class Travis::Api::App
           Metriks.meter('api.request.create').mark
           Travis::Sidekiq::BuildRequest.perform_async(type: 'api', payload: payload, credentials: {})
           messages << { notice: 'Build request scheduled.' }
-          true
+          :success
         end
 
         def not_found
           messages << { error: "Repository #{slug} not found." }
-          false
+          :not_found
         end
 
         def active?
diff --git a/spec/unit/endpoint/requests_spec.rb b/spec/unit/endpoint/requests_spec.rb
index 03ec98f8..4e04e82d 100644
--- a/spec/unit/endpoint/requests_spec.rb
+++ b/spec/unit/endpoint/requests_spec.rb
@@ -25,7 +25,7 @@ describe Travis::Api::App::Endpoint::Requests do
       end
 
       it 'includes a notice' do
-        expect(response.body).to eq '{"result":false,"flash":[{"error":"Repository owner/name not found."}]}'
+        expect(response.body).to eq '{"result":"not_found","flash":[{"error":"Repository owner/name not found."}]}'
       end
     end
 
@@ -41,7 +41,7 @@ describe Travis::Api::App::Endpoint::Requests do
       end
 
       it 'includes a notice' do
-        expect(response.body).to eq '{"result":true,"flash":[{"notice":"Build request scheduled."}]}'
+        expect(response.body).to eq '{"result":"success","flash":[{"notice":"Build request scheduled."}]}'
       end
 
       it 'schedules the build request' do

From acefb6a53bfc0ab79c8705a8944ed1d06dc004ac Mon Sep 17 00:00:00 2001
From: Sven Fuchs <me@svenfuchs.com>
Date: Tue, 21 Oct 2014 19:25:37 +0200
Subject: [PATCH 51/70] pass the repository github_id, too (required in pro)

---
 lib/travis/api/app/services/schedule_request.rb | 4 +++-
 spec/unit/endpoint/requests_spec.rb             | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/travis/api/app/services/schedule_request.rb b/lib/travis/api/app/services/schedule_request.rb
index 80fd9e20..e66bc7f2 100644
--- a/lib/travis/api/app/services/schedule_request.rb
+++ b/lib/travis/api/app/services/schedule_request.rb
@@ -34,7 +34,9 @@ class Travis::Api::App
         end
 
         def payload
-          MultiJson.encode(params.merge(user: { id: current_user.id }))
+          data = params.merge(user: { id: current_user.id })
+          data[:repository][:id] = repo.github_id
+          MultiJson.encode(data)
         end
 
         def repo
diff --git a/spec/unit/endpoint/requests_spec.rb b/spec/unit/endpoint/requests_spec.rb
index 4e04e82d..a6eb4eda 100644
--- a/spec/unit/endpoint/requests_spec.rb
+++ b/spec/unit/endpoint/requests_spec.rb
@@ -45,8 +45,9 @@ describe Travis::Api::App::Endpoint::Requests do
       end
 
       it 'schedules the build request' do
-        payload = MultiJson.encode(data[:request].merge(user: { id: user.id }))
-        Travis::Sidekiq::BuildRequest.expects(:perform_async).with(type: 'api', payload: payload, credentials: {})
+        payload = data[:request].merge(user: { id: user.id })
+        payload[:repository][:id] = repo.github_id
+        Travis::Sidekiq::BuildRequest.expects(:perform_async).with(type: 'api', payload: MultiJson.encode(payload), credentials: {})
         response
       end
     end

From 07fff5a7beca765259b21dd235df66fe671b5505 Mon Sep 17 00:00:00 2001
From: Konstantin Haase <konstantin.mailinglists@googlemail.com>
Date: Mon, 27 Oct 2014 19:21:23 +0100
Subject: [PATCH 52/70] track and enforce user-agent

---
 Gemfile                                       |   1 +
 Gemfile.lock                                  |   6 +-
 lib/travis/api/app.rb                         |   1 +
 lib/travis/api/app/cors.rb                    |   2 +-
 .../api/app/middleware/user_agent_tracker.rb  |  85 ++++++++++++
 spec/unit/cors_spec.rb                        |   2 +-
 .../middleware/user_agent_tracker_spec.rb     | 123 ++++++++++++++++++
 travis-api.gemspec                            |  40 ++++--
 8 files changed, 242 insertions(+), 18 deletions(-)
 create mode 100644 lib/travis/api/app/middleware/user_agent_tracker.rb
 create mode 100644 spec/unit/middleware/user_agent_tracker_spec.rb

diff --git a/Gemfile b/Gemfile
index 0e4250f8..b53a1b08 100644
--- a/Gemfile
+++ b/Gemfile
@@ -25,6 +25,7 @@ gem 'pry'
 gem 'metriks',         '0.9.9.6'
 gem 'metriks-librato_metrics', github: 'eric/metriks-librato_metrics'
 gem 'micro_migrations'
+gem 'useragent'
 
 group :test do
   gem 'rspec',         '~> 2.13'
diff --git a/Gemfile.lock b/Gemfile.lock
index 464628f7..ffb01fae 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -36,7 +36,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-core.git
-  revision: 0f487381ecf7f06f759116b60a1e9e8544784286
+  revision: 0f7a43a373cd3a7236ed4b5d3ca4a312a4e4c656
   specs:
     travis-core (0.0.1)
       actionmailer (~> 3.2.19)
@@ -74,7 +74,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-yaml.git
-  revision: 121678eba7280b8269a73c56953cafd20e884bdc
+  revision: e899680992e31b25ddc0aad33d2189a7e588cc1f
   specs:
     travis-yaml (0.1.0)
 
@@ -321,6 +321,7 @@ GEM
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
+    useragent (0.10.0)
     uuidtools (2.1.5)
     virtus (1.0.3)
       axiom-types (~> 0.1)
@@ -362,4 +363,5 @@ DEPENDENCIES
   travis-support!
   travis-yaml!
   unicorn
+  useragent
   yard-sinatra!
diff --git a/lib/travis/api/app.rb b/lib/travis/api/app.rb
index 46b2ad93..1934ede2 100644
--- a/lib/travis/api/app.rb
+++ b/lib/travis/api/app.rb
@@ -114,6 +114,7 @@ module Travis::Api
         use Travis::Api::App::Middleware::Logging
         use Travis::Api::App::Middleware::Metriks
         use Travis::Api::App::Middleware::Rewrite
+        use Travis::Api::App::Middleware::UserAgentTracker
 
         SettingsEndpoint.subclass :env_vars
         if Travis.config.endpoints.ssh_key
diff --git a/lib/travis/api/app/cors.rb b/lib/travis/api/app/cors.rb
index 781efc00..9112300b 100644
--- a/lib/travis/api/app/cors.rb
+++ b/lib/travis/api/app/cors.rb
@@ -14,7 +14,7 @@ class Travis::Api::App
 
     options // do
       headers['Access-Control-Allow-Methods'] = "HEAD, GET, POST, PATCH, PUT, DELETE"
-      headers['Access-Control-Allow-Headers'] = "Content-Type, Authorization, Accept, If-None-Match, If-Modified-Since"
+      headers['Access-Control-Allow-Headers'] = "Content-Type, Authorization, Accept, If-None-Match, If-Modified-Since, X-User-Agent"
     end
   end
 end
diff --git a/lib/travis/api/app/middleware/user_agent_tracker.rb b/lib/travis/api/app/middleware/user_agent_tracker.rb
new file mode 100644
index 00000000..cba98cf3
--- /dev/null
+++ b/lib/travis/api/app/middleware/user_agent_tracker.rb
@@ -0,0 +1,85 @@
+require 'travis/api/app'
+require 'useragent'
+
+class Travis::Api::App
+  class Middleware
+    class UserAgentTracker < Middleware
+      WEB_BROWSERS = [
+        "Internet Explorer",
+        "Webkit", "Chrome", "Safari", "Android",
+        "Firefox", "Camino", "Iceweasel", "Seamonkey", "Android",
+        "Opera", "Mozilla"
+      ]
+
+      before(agent: /^$/) do
+        ::Metriks.meter("api.user_agent.missing").mark
+        halt(400, "error" => "missing User-Agent header") if Travis::Features.feature_active?(:require_user_agent)
+      end
+
+      before(agent: /^.+$/) do
+        agent = UserAgent.parse(request.user_agent)
+        case agent.browser
+        when *WEB_BROWSERS                   then mark_browser
+        when "curl", "Wget"                  then mark(:console, agent.browser)
+        when "travis-api-wrapper"            then mark(:script, :node_js, agent.browser)
+        when "TravisPy"                      then mark(:script, :python,  agent.browser)
+        when "Ruby", "PHP", "Perl", "Python" then mark(:script, agent.browser, :vanilla)
+        when "Faraday"                       then mark(:script, :ruby, :vanilla)
+        when "Travis"                        then mark_travis(agent)
+        else mark_unknown
+        end
+      end
+
+      def mark_browser
+        # allows a JavaScript Client to set X-User-Agent, for instance to "travis-web" in travis-web
+        x_agent = UserAgent.parse(env['HTTP_X_USER_AGENT'] || 'unknown').browser
+        mark(:browser, x_agent)
+      end
+
+      def mark_travis(agent)
+        os, *rest               = agent.application.comment
+        ruby, rubygems, command = "unknown", "unknown", nil
+
+        rest.each do |comment|
+          case comment
+          when /^Ruby (\d\.\d.\d)/ then ruby     = $1
+          when /^RubyGems (.+)$/   then rubygems = $1
+          when /^command (.+)$/    then command  = $1
+          end
+        end
+
+        # "Ubuntu 12.04 like Linux" => "linux.ubuntu.12.04"
+        if os =~ /^(.+) (\S+) like (\S+)$/
+          os = "#{$3}.#{$1}.#{$2[/\d+\.\d+/]}"
+        end
+
+        if command
+          mark(:cli, version: agent.version, ruby: ruby, rubygems: rubygems, command: command, os: os)
+        else
+          # only track ruby version and library version for non-cli usage
+          mark(:script, :ruby, :travis, version: agent.version, ruby: ruby)
+        end
+      end
+
+      def mark_unknown
+        logger.warn "[user-agent-tracker] Unknown User-Agent: %p" % request.user_agent
+        mark(:unknown)
+      end
+
+      def track_key(string)
+        string.to_s.downcase.gsub(/[^a-z0-9\-\.]+/, '_')
+      end
+
+      def mark(*keys)
+        key = "api.user_agent"
+        keys.each do |subkey|
+          if subkey.is_a? Hash
+            subkey.each_pair { |k, v| ::Metriks.meter("#{key}.#{track_key(k)}.#{track_key(v)}").mark }
+          else
+            ::Metriks.meter(key << "." << track_key(subkey)).mark
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/spec/unit/cors_spec.rb b/spec/unit/cors_spec.rb
index 83e79914..cd90dd6d 100644
--- a/spec/unit/cors_spec.rb
+++ b/spec/unit/cors_spec.rb
@@ -44,7 +44,7 @@ describe Travis::Api::App::Cors do
     end
 
     it 'sets Access-Control-Allow-Headers' do
-      headers['Access-Control-Allow-Headers'].should == "Content-Type, Authorization, Accept, If-None-Match, If-Modified-Since"
+      headers['Access-Control-Allow-Headers'].should == "Content-Type, Authorization, Accept, If-None-Match, If-Modified-Since, X-User-Agent"
     end
   end
 end
diff --git a/spec/unit/middleware/user_agent_tracker_spec.rb b/spec/unit/middleware/user_agent_tracker_spec.rb
new file mode 100644
index 00000000..7fbe0c29
--- /dev/null
+++ b/spec/unit/middleware/user_agent_tracker_spec.rb
@@ -0,0 +1,123 @@
+require 'spec_helper'
+
+describe Travis::Api::App::Middleware::UserAgentTracker do
+  before do
+    mock_app do
+      use Travis::Api::App::Middleware::UserAgentTracker
+      get('/') { 'ok' }
+    end
+  end
+
+  def expect_meter(name)
+    Metriks.expects(:meter).with(name).returns(stub("meter", mark: nil))
+  end
+
+  def get(env = {})
+    env['HTTP_USER_AGENT'] ||= agent if agent
+    super('/', {}, env)
+  end
+
+  context 'missing User-Agent' do
+    let(:agent) { }
+
+    it "tracks it" do
+      expect_meter("api.user_agent.missing")
+      get.should be_ok
+    end
+
+    it "denies request if require_user_agent feature is enabled" do
+      Travis::Features.expects(:feature_active?).with(:require_user_agent).returns(true)
+      get.status.should be == 400
+    end
+  end
+
+  context 'web browser' do
+    let(:agent) { "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.36 Safari/537.36" }
+
+    specify 'without X-User-Agent' do
+      expect_meter("api.user_agent.browser")
+      expect_meter("api.user_agent.browser.unknown")
+      get
+    end
+
+    specify 'with X-User-Agent' do
+      expect_meter("api.user_agent.browser")
+      expect_meter("api.user_agent.browser.travis-web")
+      get('HTTP_X_USER_AGENT' => 'travis-web')
+    end
+  end
+
+  context 'console' do
+    let(:agent) { 'curl' }
+    specify do
+      expect_meter("api.user_agent.console")
+      expect_meter("api.user_agent.console.curl")
+      get
+    end
+  end
+
+  context 'travis-api-wrapper' do
+    let(:agent) { 'travis-api-wrapper - v0.01 - (cmaujean@gmail.com)' }
+    specify do
+      expect_meter("api.user_agent.script")
+      expect_meter("api.user_agent.script.node_js")
+      expect_meter("api.user_agent.script.node_js.travis-api-wrapper")
+      get
+    end
+  end
+
+  context 'TravisPy' do
+    let(:agent) { 'TravisPy' }
+    specify do
+      expect_meter("api.user_agent.script")
+      expect_meter("api.user_agent.script.python")
+      expect_meter("api.user_agent.script.python.travispy")
+      get
+    end
+  end
+
+  context 'Ruby' do
+    let(:agent) { 'Ruby' }
+    specify do
+      expect_meter("api.user_agent.script")
+      expect_meter("api.user_agent.script.ruby")
+      expect_meter("api.user_agent.script.ruby.vanilla")
+      get
+    end
+  end
+
+  context 'Faraday' do
+    let(:agent) { 'Faraday' }
+    specify do
+      expect_meter("api.user_agent.script")
+      expect_meter("api.user_agent.script.ruby")
+      expect_meter("api.user_agent.script.ruby.vanilla")
+      get
+    end
+  end
+
+  context 'travis.rb' do
+    let(:agent) { 'Travis/1.6.8 (Mac OS X 10.9.2 like Darwin; Ruby 2.1.1p42; RubyGems 2.0.14) Faraday/0.8.9 Typhoeus/0.6.7' }
+    specify do
+      expect_meter("api.user_agent.script")
+      expect_meter("api.user_agent.script.ruby")
+      expect_meter("api.user_agent.script.ruby.travis")
+      expect_meter("api.user_agent.script.ruby.travis.version.1.6.8")
+      expect_meter("api.user_agent.script.ruby.travis.ruby.2.1.1")
+      get
+    end
+  end
+
+  context 'Travis CLI' do
+    let(:agent) { 'Travis/1.6.8 (Mac OS X 10.10.2 like Darwin; Ruby 2.1.1; RubyGems 2.0.14; command whoami) Faraday/0.8.9 Typhoeus/0.6.7' }
+    specify do
+      expect_meter("api.user_agent.cli")
+      expect_meter("api.user_agent.cli.version.1.6.8")
+      expect_meter("api.user_agent.cli.ruby.2.1.1")
+      expect_meter("api.user_agent.cli.rubygems.2.0.14")
+      expect_meter("api.user_agent.cli.command.whoami")
+      expect_meter("api.user_agent.cli.os.darwin.mac_os_x.10.10")
+      get
+    end
+  end
+end
diff --git a/travis-api.gemspec b/travis-api.gemspec
index 7719fff7..868839c9 100644
--- a/travis-api.gemspec
+++ b/travis-api.gemspec
@@ -18,17 +18,18 @@ Gem::Specification.new do |s|
     "Henrik Hodne",
     "Andre Arko",
     "Erik Michaels-Ober",
-    "Brian Ford",
     "Steve Richert",
-    "rainsun",
-    "Bryan Goldstein",
-    "James Dennes",
-    "Nick Schonning",
+    "Brian Ford",
     "Patrick Williams",
+    "Bryan Goldstein",
     "Puneeth Chaganti",
     "Thais Camilo and Konstantin Haase",
     "Tim Carey-Smith",
-    "Zachary Scott"
+    "Zachary Scott",
+    "James Dennes",
+    "rainsun",
+    "Dan Rice",
+    "Nick Schonning"
   ]
 
   s.email = [
@@ -44,17 +45,19 @@ Gem::Specification.new do |s|
     "andre@arko.net",
     "svenfuchs@artweb-design.de",
     "sferik@gmail.com",
-    "bford@engineyard.com",
+    "henrik@travis-ci.com",
     "steve.richert@gmail.com",
-    "patrick@bittorrent.com",
-    "punchagan@muse-amuse.in",
-    "jdennes@gmail.com",
+    "bford@engineyard.com",
     "nschonni@gmail.com",
+    "brysgo@gmail.com",
+    "punchagan@muse-amuse.in",
+    "e@zzak.io",
+    "jdennes@gmail.com",
     "rainsuner@gmail.com",
     "dev+narwen+rkh@rkh.im",
     "tim@spork.in",
-    "e@zzak.io",
-    "brysgo@gmail.com"
+    "dan@zoombody.com",
+    "patrick@bittorrent.com"
   ]
 
   s.files = [
@@ -65,7 +68,6 @@ Gem::Specification.new do |s|
     "bin/start-nginx",
     "config.ru",
     "config/database.yml",
-    "config/nginx.conf.erb",
     "config/puma-config.rb",
     "config/unicorn.rb",
     "lib/tasks/build_update_branch.rake",
@@ -83,6 +85,7 @@ Gem::Specification.new do |s|
     "lib/travis/api/app/endpoint/builds.rb",
     "lib/travis/api/app/endpoint/documentation.rb",
     "lib/travis/api/app/endpoint/endpoints.rb",
+    "lib/travis/api/app/endpoint/env_vars.rb",
     "lib/travis/api/app/endpoint/home.rb",
     "lib/travis/api/app/endpoint/hooks.rb",
     "lib/travis/api/app/endpoint/jobs.rb",
@@ -91,6 +94,7 @@ Gem::Specification.new do |s|
     "lib/travis/api/app/endpoint/repos.rb",
     "lib/travis/api/app/endpoint/requests.rb",
     "lib/travis/api/app/endpoint/setting_endpoint.rb",
+    "lib/travis/api/app/endpoint/singleton_settings_endpoint.rb",
     "lib/travis/api/app/endpoint/uptime.rb",
     "lib/travis/api/app/endpoint/users.rb",
     "lib/travis/api/app/extensions.rb",
@@ -119,6 +123,7 @@ Gem::Specification.new do |s|
     "lib/travis/api/app/responders/plain.rb",
     "lib/travis/api/app/responders/service.rb",
     "lib/travis/api/app/responders/xml.rb",
+    "lib/travis/api/app/services/schedule_request.rb",
     "lib/travis/api/serializer.rb",
     "lib/travis/api/v2.rb",
     "lib/travis/api/v2/http.rb",
@@ -143,11 +148,13 @@ Gem::Specification.new do |s|
     "lib/travis/api/v2/http/request.rb",
     "lib/travis/api/v2/http/requests.rb",
     "lib/travis/api/v2/http/ssh_key.rb",
-    "lib/travis/api/v2/http/ssh_keys.rb",
     "lib/travis/api/v2/http/ssl_key.rb",
     "lib/travis/api/v2/http/user.rb",
     "lib/travis/api/v2/http/validation_error.rb",
+    "lib/travis/private_key.rb",
     "public/favicon.ico",
+    "public/images/result/canceled.png",
+    "public/images/result/canceled.svg",
     "public/images/result/error.png",
     "public/images/result/error.svg",
     "public/images/result/failing.png",
@@ -159,12 +166,14 @@ Gem::Specification.new do |s|
     "public/images/result/unknown.png",
     "public/images/result/unknown.svg",
     "script/console",
+    "script/repos_stats.rb",
     "script/server",
     "spec/integration/formats_handling_spec.rb",
     "spec/integration/responders_spec.rb",
     "spec/integration/routes.backup.rb",
     "spec/integration/scopes_spec.rb",
     "spec/integration/settings_endpoint_spec.rb",
+    "spec/integration/singleton_settings_endpoint_spec.rb",
     "spec/integration/uptime_spec.rb",
     "spec/integration/v1/branches_spec.rb",
     "spec/integration/v1/builds_spec.rb",
@@ -179,6 +188,7 @@ Gem::Specification.new do |s|
     "spec/integration/v2/repositories_spec.rb",
     "spec/integration/v2/requests_spec.rb",
     "spec/integration/v2/settings/env_vars_spec.rb",
+    "spec/integration/v2/settings/ssh_key_spec.rb",
     "spec/integration/v2/users_spec.rb",
     "spec/integration/v2_spec.backup.rb",
     "spec/integration/version_spec.rb",
@@ -194,6 +204,7 @@ Gem::Specification.new do |s|
     "spec/unit/api/v2/http/build_spec.rb",
     "spec/unit/api/v2/http/builds_spec.rb",
     "spec/unit/api/v2/http/caches_spec.rb",
+    "spec/unit/api/v2/http/env_var_spec.rb",
     "spec/unit/api/v2/http/hooks_spec.rb",
     "spec/unit/api/v2/http/job_spec.rb",
     "spec/unit/api/v2/http/jobs_spec.rb",
@@ -219,6 +230,7 @@ Gem::Specification.new do |s|
     "spec/unit/endpoint/lint_spec.rb",
     "spec/unit/endpoint/logs_spec.rb",
     "spec/unit/endpoint/repos_spec.rb",
+    "spec/unit/endpoint/requests_spec.rb",
     "spec/unit/endpoint/users_spec.rb",
     "spec/unit/endpoint_spec.rb",
     "spec/unit/extensions/expose_pattern_spec.rb",

From 2227d0042f166659466b38a1f2db975b735f3638 Mon Sep 17 00:00:00 2001
From: Hiro Asari <asari.ruby@gmail.com>
Date: Mon, 27 Oct 2014 18:51:32 -0400
Subject: [PATCH 53/70] Revert "track and enforce user-agent"

---
 Gemfile                                       |   1 -
 Gemfile.lock                                  |   6 +-
 lib/travis/api/app.rb                         |   1 -
 lib/travis/api/app/cors.rb                    |   2 +-
 .../api/app/middleware/user_agent_tracker.rb  |  85 ------------
 spec/unit/cors_spec.rb                        |   2 +-
 .../middleware/user_agent_tracker_spec.rb     | 123 ------------------
 travis-api.gemspec                            |  38 ++----
 8 files changed, 17 insertions(+), 241 deletions(-)
 delete mode 100644 lib/travis/api/app/middleware/user_agent_tracker.rb
 delete mode 100644 spec/unit/middleware/user_agent_tracker_spec.rb

diff --git a/Gemfile b/Gemfile
index b53a1b08..0e4250f8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -25,7 +25,6 @@ gem 'pry'
 gem 'metriks',         '0.9.9.6'
 gem 'metriks-librato_metrics', github: 'eric/metriks-librato_metrics'
 gem 'micro_migrations'
-gem 'useragent'
 
 group :test do
   gem 'rspec',         '~> 2.13'
diff --git a/Gemfile.lock b/Gemfile.lock
index ffb01fae..464628f7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -36,7 +36,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-core.git
-  revision: 0f7a43a373cd3a7236ed4b5d3ca4a312a4e4c656
+  revision: 0f487381ecf7f06f759116b60a1e9e8544784286
   specs:
     travis-core (0.0.1)
       actionmailer (~> 3.2.19)
@@ -74,7 +74,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-yaml.git
-  revision: e899680992e31b25ddc0aad33d2189a7e588cc1f
+  revision: 121678eba7280b8269a73c56953cafd20e884bdc
   specs:
     travis-yaml (0.1.0)
 
@@ -321,7 +321,6 @@ GEM
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
-    useragent (0.10.0)
     uuidtools (2.1.5)
     virtus (1.0.3)
       axiom-types (~> 0.1)
@@ -363,5 +362,4 @@ DEPENDENCIES
   travis-support!
   travis-yaml!
   unicorn
-  useragent
   yard-sinatra!
diff --git a/lib/travis/api/app.rb b/lib/travis/api/app.rb
index 1934ede2..46b2ad93 100644
--- a/lib/travis/api/app.rb
+++ b/lib/travis/api/app.rb
@@ -114,7 +114,6 @@ module Travis::Api
         use Travis::Api::App::Middleware::Logging
         use Travis::Api::App::Middleware::Metriks
         use Travis::Api::App::Middleware::Rewrite
-        use Travis::Api::App::Middleware::UserAgentTracker
 
         SettingsEndpoint.subclass :env_vars
         if Travis.config.endpoints.ssh_key
diff --git a/lib/travis/api/app/cors.rb b/lib/travis/api/app/cors.rb
index 9112300b..781efc00 100644
--- a/lib/travis/api/app/cors.rb
+++ b/lib/travis/api/app/cors.rb
@@ -14,7 +14,7 @@ class Travis::Api::App
 
     options // do
       headers['Access-Control-Allow-Methods'] = "HEAD, GET, POST, PATCH, PUT, DELETE"
-      headers['Access-Control-Allow-Headers'] = "Content-Type, Authorization, Accept, If-None-Match, If-Modified-Since, X-User-Agent"
+      headers['Access-Control-Allow-Headers'] = "Content-Type, Authorization, Accept, If-None-Match, If-Modified-Since"
     end
   end
 end
diff --git a/lib/travis/api/app/middleware/user_agent_tracker.rb b/lib/travis/api/app/middleware/user_agent_tracker.rb
deleted file mode 100644
index cba98cf3..00000000
--- a/lib/travis/api/app/middleware/user_agent_tracker.rb
+++ /dev/null
@@ -1,85 +0,0 @@
-require 'travis/api/app'
-require 'useragent'
-
-class Travis::Api::App
-  class Middleware
-    class UserAgentTracker < Middleware
-      WEB_BROWSERS = [
-        "Internet Explorer",
-        "Webkit", "Chrome", "Safari", "Android",
-        "Firefox", "Camino", "Iceweasel", "Seamonkey", "Android",
-        "Opera", "Mozilla"
-      ]
-
-      before(agent: /^$/) do
-        ::Metriks.meter("api.user_agent.missing").mark
-        halt(400, "error" => "missing User-Agent header") if Travis::Features.feature_active?(:require_user_agent)
-      end
-
-      before(agent: /^.+$/) do
-        agent = UserAgent.parse(request.user_agent)
-        case agent.browser
-        when *WEB_BROWSERS                   then mark_browser
-        when "curl", "Wget"                  then mark(:console, agent.browser)
-        when "travis-api-wrapper"            then mark(:script, :node_js, agent.browser)
-        when "TravisPy"                      then mark(:script, :python,  agent.browser)
-        when "Ruby", "PHP", "Perl", "Python" then mark(:script, agent.browser, :vanilla)
-        when "Faraday"                       then mark(:script, :ruby, :vanilla)
-        when "Travis"                        then mark_travis(agent)
-        else mark_unknown
-        end
-      end
-
-      def mark_browser
-        # allows a JavaScript Client to set X-User-Agent, for instance to "travis-web" in travis-web
-        x_agent = UserAgent.parse(env['HTTP_X_USER_AGENT'] || 'unknown').browser
-        mark(:browser, x_agent)
-      end
-
-      def mark_travis(agent)
-        os, *rest               = agent.application.comment
-        ruby, rubygems, command = "unknown", "unknown", nil
-
-        rest.each do |comment|
-          case comment
-          when /^Ruby (\d\.\d.\d)/ then ruby     = $1
-          when /^RubyGems (.+)$/   then rubygems = $1
-          when /^command (.+)$/    then command  = $1
-          end
-        end
-
-        # "Ubuntu 12.04 like Linux" => "linux.ubuntu.12.04"
-        if os =~ /^(.+) (\S+) like (\S+)$/
-          os = "#{$3}.#{$1}.#{$2[/\d+\.\d+/]}"
-        end
-
-        if command
-          mark(:cli, version: agent.version, ruby: ruby, rubygems: rubygems, command: command, os: os)
-        else
-          # only track ruby version and library version for non-cli usage
-          mark(:script, :ruby, :travis, version: agent.version, ruby: ruby)
-        end
-      end
-
-      def mark_unknown
-        logger.warn "[user-agent-tracker] Unknown User-Agent: %p" % request.user_agent
-        mark(:unknown)
-      end
-
-      def track_key(string)
-        string.to_s.downcase.gsub(/[^a-z0-9\-\.]+/, '_')
-      end
-
-      def mark(*keys)
-        key = "api.user_agent"
-        keys.each do |subkey|
-          if subkey.is_a? Hash
-            subkey.each_pair { |k, v| ::Metriks.meter("#{key}.#{track_key(k)}.#{track_key(v)}").mark }
-          else
-            ::Metriks.meter(key << "." << track_key(subkey)).mark
-          end
-        end
-      end
-    end
-  end
-end
diff --git a/spec/unit/cors_spec.rb b/spec/unit/cors_spec.rb
index cd90dd6d..83e79914 100644
--- a/spec/unit/cors_spec.rb
+++ b/spec/unit/cors_spec.rb
@@ -44,7 +44,7 @@ describe Travis::Api::App::Cors do
     end
 
     it 'sets Access-Control-Allow-Headers' do
-      headers['Access-Control-Allow-Headers'].should == "Content-Type, Authorization, Accept, If-None-Match, If-Modified-Since, X-User-Agent"
+      headers['Access-Control-Allow-Headers'].should == "Content-Type, Authorization, Accept, If-None-Match, If-Modified-Since"
     end
   end
 end
diff --git a/spec/unit/middleware/user_agent_tracker_spec.rb b/spec/unit/middleware/user_agent_tracker_spec.rb
deleted file mode 100644
index 7fbe0c29..00000000
--- a/spec/unit/middleware/user_agent_tracker_spec.rb
+++ /dev/null
@@ -1,123 +0,0 @@
-require 'spec_helper'
-
-describe Travis::Api::App::Middleware::UserAgentTracker do
-  before do
-    mock_app do
-      use Travis::Api::App::Middleware::UserAgentTracker
-      get('/') { 'ok' }
-    end
-  end
-
-  def expect_meter(name)
-    Metriks.expects(:meter).with(name).returns(stub("meter", mark: nil))
-  end
-
-  def get(env = {})
-    env['HTTP_USER_AGENT'] ||= agent if agent
-    super('/', {}, env)
-  end
-
-  context 'missing User-Agent' do
-    let(:agent) { }
-
-    it "tracks it" do
-      expect_meter("api.user_agent.missing")
-      get.should be_ok
-    end
-
-    it "denies request if require_user_agent feature is enabled" do
-      Travis::Features.expects(:feature_active?).with(:require_user_agent).returns(true)
-      get.status.should be == 400
-    end
-  end
-
-  context 'web browser' do
-    let(:agent) { "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.36 Safari/537.36" }
-
-    specify 'without X-User-Agent' do
-      expect_meter("api.user_agent.browser")
-      expect_meter("api.user_agent.browser.unknown")
-      get
-    end
-
-    specify 'with X-User-Agent' do
-      expect_meter("api.user_agent.browser")
-      expect_meter("api.user_agent.browser.travis-web")
-      get('HTTP_X_USER_AGENT' => 'travis-web')
-    end
-  end
-
-  context 'console' do
-    let(:agent) { 'curl' }
-    specify do
-      expect_meter("api.user_agent.console")
-      expect_meter("api.user_agent.console.curl")
-      get
-    end
-  end
-
-  context 'travis-api-wrapper' do
-    let(:agent) { 'travis-api-wrapper - v0.01 - (cmaujean@gmail.com)' }
-    specify do
-      expect_meter("api.user_agent.script")
-      expect_meter("api.user_agent.script.node_js")
-      expect_meter("api.user_agent.script.node_js.travis-api-wrapper")
-      get
-    end
-  end
-
-  context 'TravisPy' do
-    let(:agent) { 'TravisPy' }
-    specify do
-      expect_meter("api.user_agent.script")
-      expect_meter("api.user_agent.script.python")
-      expect_meter("api.user_agent.script.python.travispy")
-      get
-    end
-  end
-
-  context 'Ruby' do
-    let(:agent) { 'Ruby' }
-    specify do
-      expect_meter("api.user_agent.script")
-      expect_meter("api.user_agent.script.ruby")
-      expect_meter("api.user_agent.script.ruby.vanilla")
-      get
-    end
-  end
-
-  context 'Faraday' do
-    let(:agent) { 'Faraday' }
-    specify do
-      expect_meter("api.user_agent.script")
-      expect_meter("api.user_agent.script.ruby")
-      expect_meter("api.user_agent.script.ruby.vanilla")
-      get
-    end
-  end
-
-  context 'travis.rb' do
-    let(:agent) { 'Travis/1.6.8 (Mac OS X 10.9.2 like Darwin; Ruby 2.1.1p42; RubyGems 2.0.14) Faraday/0.8.9 Typhoeus/0.6.7' }
-    specify do
-      expect_meter("api.user_agent.script")
-      expect_meter("api.user_agent.script.ruby")
-      expect_meter("api.user_agent.script.ruby.travis")
-      expect_meter("api.user_agent.script.ruby.travis.version.1.6.8")
-      expect_meter("api.user_agent.script.ruby.travis.ruby.2.1.1")
-      get
-    end
-  end
-
-  context 'Travis CLI' do
-    let(:agent) { 'Travis/1.6.8 (Mac OS X 10.10.2 like Darwin; Ruby 2.1.1; RubyGems 2.0.14; command whoami) Faraday/0.8.9 Typhoeus/0.6.7' }
-    specify do
-      expect_meter("api.user_agent.cli")
-      expect_meter("api.user_agent.cli.version.1.6.8")
-      expect_meter("api.user_agent.cli.ruby.2.1.1")
-      expect_meter("api.user_agent.cli.rubygems.2.0.14")
-      expect_meter("api.user_agent.cli.command.whoami")
-      expect_meter("api.user_agent.cli.os.darwin.mac_os_x.10.10")
-      get
-    end
-  end
-end
diff --git a/travis-api.gemspec b/travis-api.gemspec
index 868839c9..7719fff7 100644
--- a/travis-api.gemspec
+++ b/travis-api.gemspec
@@ -18,18 +18,17 @@ Gem::Specification.new do |s|
     "Henrik Hodne",
     "Andre Arko",
     "Erik Michaels-Ober",
-    "Steve Richert",
     "Brian Ford",
-    "Patrick Williams",
+    "Steve Richert",
+    "rainsun",
     "Bryan Goldstein",
+    "James Dennes",
+    "Nick Schonning",
+    "Patrick Williams",
     "Puneeth Chaganti",
     "Thais Camilo and Konstantin Haase",
     "Tim Carey-Smith",
-    "Zachary Scott",
-    "James Dennes",
-    "rainsun",
-    "Dan Rice",
-    "Nick Schonning"
+    "Zachary Scott"
   ]
 
   s.email = [
@@ -45,19 +44,17 @@ Gem::Specification.new do |s|
     "andre@arko.net",
     "svenfuchs@artweb-design.de",
     "sferik@gmail.com",
-    "henrik@travis-ci.com",
-    "steve.richert@gmail.com",
     "bford@engineyard.com",
-    "nschonni@gmail.com",
-    "brysgo@gmail.com",
+    "steve.richert@gmail.com",
+    "patrick@bittorrent.com",
     "punchagan@muse-amuse.in",
-    "e@zzak.io",
     "jdennes@gmail.com",
+    "nschonni@gmail.com",
     "rainsuner@gmail.com",
     "dev+narwen+rkh@rkh.im",
     "tim@spork.in",
-    "dan@zoombody.com",
-    "patrick@bittorrent.com"
+    "e@zzak.io",
+    "brysgo@gmail.com"
   ]
 
   s.files = [
@@ -68,6 +65,7 @@ Gem::Specification.new do |s|
     "bin/start-nginx",
     "config.ru",
     "config/database.yml",
+    "config/nginx.conf.erb",
     "config/puma-config.rb",
     "config/unicorn.rb",
     "lib/tasks/build_update_branch.rake",
@@ -85,7 +83,6 @@ Gem::Specification.new do |s|
     "lib/travis/api/app/endpoint/builds.rb",
     "lib/travis/api/app/endpoint/documentation.rb",
     "lib/travis/api/app/endpoint/endpoints.rb",
-    "lib/travis/api/app/endpoint/env_vars.rb",
     "lib/travis/api/app/endpoint/home.rb",
     "lib/travis/api/app/endpoint/hooks.rb",
     "lib/travis/api/app/endpoint/jobs.rb",
@@ -94,7 +91,6 @@ Gem::Specification.new do |s|
     "lib/travis/api/app/endpoint/repos.rb",
     "lib/travis/api/app/endpoint/requests.rb",
     "lib/travis/api/app/endpoint/setting_endpoint.rb",
-    "lib/travis/api/app/endpoint/singleton_settings_endpoint.rb",
     "lib/travis/api/app/endpoint/uptime.rb",
     "lib/travis/api/app/endpoint/users.rb",
     "lib/travis/api/app/extensions.rb",
@@ -123,7 +119,6 @@ Gem::Specification.new do |s|
     "lib/travis/api/app/responders/plain.rb",
     "lib/travis/api/app/responders/service.rb",
     "lib/travis/api/app/responders/xml.rb",
-    "lib/travis/api/app/services/schedule_request.rb",
     "lib/travis/api/serializer.rb",
     "lib/travis/api/v2.rb",
     "lib/travis/api/v2/http.rb",
@@ -148,13 +143,11 @@ Gem::Specification.new do |s|
     "lib/travis/api/v2/http/request.rb",
     "lib/travis/api/v2/http/requests.rb",
     "lib/travis/api/v2/http/ssh_key.rb",
+    "lib/travis/api/v2/http/ssh_keys.rb",
     "lib/travis/api/v2/http/ssl_key.rb",
     "lib/travis/api/v2/http/user.rb",
     "lib/travis/api/v2/http/validation_error.rb",
-    "lib/travis/private_key.rb",
     "public/favicon.ico",
-    "public/images/result/canceled.png",
-    "public/images/result/canceled.svg",
     "public/images/result/error.png",
     "public/images/result/error.svg",
     "public/images/result/failing.png",
@@ -166,14 +159,12 @@ Gem::Specification.new do |s|
     "public/images/result/unknown.png",
     "public/images/result/unknown.svg",
     "script/console",
-    "script/repos_stats.rb",
     "script/server",
     "spec/integration/formats_handling_spec.rb",
     "spec/integration/responders_spec.rb",
     "spec/integration/routes.backup.rb",
     "spec/integration/scopes_spec.rb",
     "spec/integration/settings_endpoint_spec.rb",
-    "spec/integration/singleton_settings_endpoint_spec.rb",
     "spec/integration/uptime_spec.rb",
     "spec/integration/v1/branches_spec.rb",
     "spec/integration/v1/builds_spec.rb",
@@ -188,7 +179,6 @@ Gem::Specification.new do |s|
     "spec/integration/v2/repositories_spec.rb",
     "spec/integration/v2/requests_spec.rb",
     "spec/integration/v2/settings/env_vars_spec.rb",
-    "spec/integration/v2/settings/ssh_key_spec.rb",
     "spec/integration/v2/users_spec.rb",
     "spec/integration/v2_spec.backup.rb",
     "spec/integration/version_spec.rb",
@@ -204,7 +194,6 @@ Gem::Specification.new do |s|
     "spec/unit/api/v2/http/build_spec.rb",
     "spec/unit/api/v2/http/builds_spec.rb",
     "spec/unit/api/v2/http/caches_spec.rb",
-    "spec/unit/api/v2/http/env_var_spec.rb",
     "spec/unit/api/v2/http/hooks_spec.rb",
     "spec/unit/api/v2/http/job_spec.rb",
     "spec/unit/api/v2/http/jobs_spec.rb",
@@ -230,7 +219,6 @@ Gem::Specification.new do |s|
     "spec/unit/endpoint/lint_spec.rb",
     "spec/unit/endpoint/logs_spec.rb",
     "spec/unit/endpoint/repos_spec.rb",
-    "spec/unit/endpoint/requests_spec.rb",
     "spec/unit/endpoint/users_spec.rb",
     "spec/unit/endpoint_spec.rb",
     "spec/unit/extensions/expose_pattern_spec.rb",

From 0739312391890952b4a1b315da0df557bb84076b Mon Sep 17 00:00:00 2001
From: Hiro Asari <asari.ruby@gmail.com>
Date: Mon, 27 Oct 2014 23:43:04 -0400
Subject: [PATCH 54/70] Update dependencies

---
 Gemfile      |  2 +-
 Gemfile.lock | 21 +++++++++++----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/Gemfile b/Gemfile
index 0e4250f8..a3e35857 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ ruby '2.1.2'
 source 'https://rubygems.org'
 gemspec
 
-gem 'travis-core',     github: 'travis-ci/travis-core'
+gem 'travis-core',     github: 'travis-ci/travis-core', branch: 'sf-hiro-bugfix'
 gem 'travis-support',  github: 'travis-ci/travis-support'
 gem 'travis-config',   '~> 0.1.0'
 gem 'travis-sidekiqs', github: 'travis-ci/travis-sidekiqs', require: nil, ref: 'cde9741'
diff --git a/Gemfile.lock b/Gemfile.lock
index 464628f7..4f9b7de7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -7,7 +7,7 @@ GIT
 
 GIT
   remote: git://github.com/getsentry/raven-ruby.git
-  revision: bd026531c390a7fbc71980871a7951bc0f2d737f
+  revision: 1e12d8d5c288e97fd2fd64d28c2ffb7cad439eb2
   specs:
     sentry-raven (0.10.1)
       faraday (>= 0.7.6)
@@ -36,7 +36,8 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-core.git
-  revision: 0f487381ecf7f06f759116b60a1e9e8544784286
+  revision: e333a0127c1e09ba37edd547c9243478aba0f788
+  branch: sf-hiro-bugfix
   specs:
     travis-core (0.0.1)
       actionmailer (~> 3.2.19)
@@ -68,13 +69,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: 121678eba7280b8269a73c56953cafd20e884bdc
+  revision: 2c6ac75077123095e2ee8e8db435342ba2d03c2d
   specs:
     travis-yaml (0.1.0)
 
@@ -136,7 +137,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 +172,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 +228,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 +269,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 +317,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
@@ -327,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

From e7e237943b148659280bea9c23cb4e9d34462949 Mon Sep 17 00:00:00 2001
From: Hiro Asari <asari.ruby@gmail.com>
Date: Tue, 28 Oct 2014 00:13:29 -0400
Subject: [PATCH 55/70] Update travis-core

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 4f9b7de7..3255c6fa 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -36,7 +36,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-core.git
-  revision: e333a0127c1e09ba37edd547c9243478aba0f788
+  revision: da5902bf0cbf1d4031bb4a6c7e7c82ff35ecc414
   branch: sf-hiro-bugfix
   specs:
     travis-core (0.0.1)

From 14623ed08820ec1760b550b9e791aac2af5df81b Mon Sep 17 00:00:00 2001
From: Konstantin Haase <konstantin.mailinglists@googlemail.com>
Date: Tue, 28 Oct 2014 11:10:25 +0100
Subject: [PATCH 56/70] Revert "Revert "track and enforce user-agent""

This reverts commit 2227d0042f166659466b38a1f2db975b735f3638.
---
 Gemfile                                       |   1 +
 Gemfile.lock                                  |   6 +-
 lib/travis/api/app.rb                         |   1 +
 lib/travis/api/app/cors.rb                    |   2 +-
 .../api/app/middleware/user_agent_tracker.rb  |  85 ++++++++++++
 spec/unit/cors_spec.rb                        |   2 +-
 .../middleware/user_agent_tracker_spec.rb     | 123 ++++++++++++++++++
 travis-api.gemspec                            |  40 ++++--
 8 files changed, 242 insertions(+), 18 deletions(-)
 create mode 100644 lib/travis/api/app/middleware/user_agent_tracker.rb
 create mode 100644 spec/unit/middleware/user_agent_tracker_spec.rb

diff --git a/Gemfile b/Gemfile
index 0e4250f8..b53a1b08 100644
--- a/Gemfile
+++ b/Gemfile
@@ -25,6 +25,7 @@ gem 'pry'
 gem 'metriks',         '0.9.9.6'
 gem 'metriks-librato_metrics', github: 'eric/metriks-librato_metrics'
 gem 'micro_migrations'
+gem 'useragent'
 
 group :test do
   gem 'rspec',         '~> 2.13'
diff --git a/Gemfile.lock b/Gemfile.lock
index 464628f7..ffb01fae 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -36,7 +36,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-core.git
-  revision: 0f487381ecf7f06f759116b60a1e9e8544784286
+  revision: 0f7a43a373cd3a7236ed4b5d3ca4a312a4e4c656
   specs:
     travis-core (0.0.1)
       actionmailer (~> 3.2.19)
@@ -74,7 +74,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-yaml.git
-  revision: 121678eba7280b8269a73c56953cafd20e884bdc
+  revision: e899680992e31b25ddc0aad33d2189a7e588cc1f
   specs:
     travis-yaml (0.1.0)
 
@@ -321,6 +321,7 @@ GEM
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
+    useragent (0.10.0)
     uuidtools (2.1.5)
     virtus (1.0.3)
       axiom-types (~> 0.1)
@@ -362,4 +363,5 @@ DEPENDENCIES
   travis-support!
   travis-yaml!
   unicorn
+  useragent
   yard-sinatra!
diff --git a/lib/travis/api/app.rb b/lib/travis/api/app.rb
index 46b2ad93..1934ede2 100644
--- a/lib/travis/api/app.rb
+++ b/lib/travis/api/app.rb
@@ -114,6 +114,7 @@ module Travis::Api
         use Travis::Api::App::Middleware::Logging
         use Travis::Api::App::Middleware::Metriks
         use Travis::Api::App::Middleware::Rewrite
+        use Travis::Api::App::Middleware::UserAgentTracker
 
         SettingsEndpoint.subclass :env_vars
         if Travis.config.endpoints.ssh_key
diff --git a/lib/travis/api/app/cors.rb b/lib/travis/api/app/cors.rb
index 781efc00..9112300b 100644
--- a/lib/travis/api/app/cors.rb
+++ b/lib/travis/api/app/cors.rb
@@ -14,7 +14,7 @@ class Travis::Api::App
 
     options // do
       headers['Access-Control-Allow-Methods'] = "HEAD, GET, POST, PATCH, PUT, DELETE"
-      headers['Access-Control-Allow-Headers'] = "Content-Type, Authorization, Accept, If-None-Match, If-Modified-Since"
+      headers['Access-Control-Allow-Headers'] = "Content-Type, Authorization, Accept, If-None-Match, If-Modified-Since, X-User-Agent"
     end
   end
 end
diff --git a/lib/travis/api/app/middleware/user_agent_tracker.rb b/lib/travis/api/app/middleware/user_agent_tracker.rb
new file mode 100644
index 00000000..cba98cf3
--- /dev/null
+++ b/lib/travis/api/app/middleware/user_agent_tracker.rb
@@ -0,0 +1,85 @@
+require 'travis/api/app'
+require 'useragent'
+
+class Travis::Api::App
+  class Middleware
+    class UserAgentTracker < Middleware
+      WEB_BROWSERS = [
+        "Internet Explorer",
+        "Webkit", "Chrome", "Safari", "Android",
+        "Firefox", "Camino", "Iceweasel", "Seamonkey", "Android",
+        "Opera", "Mozilla"
+      ]
+
+      before(agent: /^$/) do
+        ::Metriks.meter("api.user_agent.missing").mark
+        halt(400, "error" => "missing User-Agent header") if Travis::Features.feature_active?(:require_user_agent)
+      end
+
+      before(agent: /^.+$/) do
+        agent = UserAgent.parse(request.user_agent)
+        case agent.browser
+        when *WEB_BROWSERS                   then mark_browser
+        when "curl", "Wget"                  then mark(:console, agent.browser)
+        when "travis-api-wrapper"            then mark(:script, :node_js, agent.browser)
+        when "TravisPy"                      then mark(:script, :python,  agent.browser)
+        when "Ruby", "PHP", "Perl", "Python" then mark(:script, agent.browser, :vanilla)
+        when "Faraday"                       then mark(:script, :ruby, :vanilla)
+        when "Travis"                        then mark_travis(agent)
+        else mark_unknown
+        end
+      end
+
+      def mark_browser
+        # allows a JavaScript Client to set X-User-Agent, for instance to "travis-web" in travis-web
+        x_agent = UserAgent.parse(env['HTTP_X_USER_AGENT'] || 'unknown').browser
+        mark(:browser, x_agent)
+      end
+
+      def mark_travis(agent)
+        os, *rest               = agent.application.comment
+        ruby, rubygems, command = "unknown", "unknown", nil
+
+        rest.each do |comment|
+          case comment
+          when /^Ruby (\d\.\d.\d)/ then ruby     = $1
+          when /^RubyGems (.+)$/   then rubygems = $1
+          when /^command (.+)$/    then command  = $1
+          end
+        end
+
+        # "Ubuntu 12.04 like Linux" => "linux.ubuntu.12.04"
+        if os =~ /^(.+) (\S+) like (\S+)$/
+          os = "#{$3}.#{$1}.#{$2[/\d+\.\d+/]}"
+        end
+
+        if command
+          mark(:cli, version: agent.version, ruby: ruby, rubygems: rubygems, command: command, os: os)
+        else
+          # only track ruby version and library version for non-cli usage
+          mark(:script, :ruby, :travis, version: agent.version, ruby: ruby)
+        end
+      end
+
+      def mark_unknown
+        logger.warn "[user-agent-tracker] Unknown User-Agent: %p" % request.user_agent
+        mark(:unknown)
+      end
+
+      def track_key(string)
+        string.to_s.downcase.gsub(/[^a-z0-9\-\.]+/, '_')
+      end
+
+      def mark(*keys)
+        key = "api.user_agent"
+        keys.each do |subkey|
+          if subkey.is_a? Hash
+            subkey.each_pair { |k, v| ::Metriks.meter("#{key}.#{track_key(k)}.#{track_key(v)}").mark }
+          else
+            ::Metriks.meter(key << "." << track_key(subkey)).mark
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/spec/unit/cors_spec.rb b/spec/unit/cors_spec.rb
index 83e79914..cd90dd6d 100644
--- a/spec/unit/cors_spec.rb
+++ b/spec/unit/cors_spec.rb
@@ -44,7 +44,7 @@ describe Travis::Api::App::Cors do
     end
 
     it 'sets Access-Control-Allow-Headers' do
-      headers['Access-Control-Allow-Headers'].should == "Content-Type, Authorization, Accept, If-None-Match, If-Modified-Since"
+      headers['Access-Control-Allow-Headers'].should == "Content-Type, Authorization, Accept, If-None-Match, If-Modified-Since, X-User-Agent"
     end
   end
 end
diff --git a/spec/unit/middleware/user_agent_tracker_spec.rb b/spec/unit/middleware/user_agent_tracker_spec.rb
new file mode 100644
index 00000000..7fbe0c29
--- /dev/null
+++ b/spec/unit/middleware/user_agent_tracker_spec.rb
@@ -0,0 +1,123 @@
+require 'spec_helper'
+
+describe Travis::Api::App::Middleware::UserAgentTracker do
+  before do
+    mock_app do
+      use Travis::Api::App::Middleware::UserAgentTracker
+      get('/') { 'ok' }
+    end
+  end
+
+  def expect_meter(name)
+    Metriks.expects(:meter).with(name).returns(stub("meter", mark: nil))
+  end
+
+  def get(env = {})
+    env['HTTP_USER_AGENT'] ||= agent if agent
+    super('/', {}, env)
+  end
+
+  context 'missing User-Agent' do
+    let(:agent) { }
+
+    it "tracks it" do
+      expect_meter("api.user_agent.missing")
+      get.should be_ok
+    end
+
+    it "denies request if require_user_agent feature is enabled" do
+      Travis::Features.expects(:feature_active?).with(:require_user_agent).returns(true)
+      get.status.should be == 400
+    end
+  end
+
+  context 'web browser' do
+    let(:agent) { "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.36 Safari/537.36" }
+
+    specify 'without X-User-Agent' do
+      expect_meter("api.user_agent.browser")
+      expect_meter("api.user_agent.browser.unknown")
+      get
+    end
+
+    specify 'with X-User-Agent' do
+      expect_meter("api.user_agent.browser")
+      expect_meter("api.user_agent.browser.travis-web")
+      get('HTTP_X_USER_AGENT' => 'travis-web')
+    end
+  end
+
+  context 'console' do
+    let(:agent) { 'curl' }
+    specify do
+      expect_meter("api.user_agent.console")
+      expect_meter("api.user_agent.console.curl")
+      get
+    end
+  end
+
+  context 'travis-api-wrapper' do
+    let(:agent) { 'travis-api-wrapper - v0.01 - (cmaujean@gmail.com)' }
+    specify do
+      expect_meter("api.user_agent.script")
+      expect_meter("api.user_agent.script.node_js")
+      expect_meter("api.user_agent.script.node_js.travis-api-wrapper")
+      get
+    end
+  end
+
+  context 'TravisPy' do
+    let(:agent) { 'TravisPy' }
+    specify do
+      expect_meter("api.user_agent.script")
+      expect_meter("api.user_agent.script.python")
+      expect_meter("api.user_agent.script.python.travispy")
+      get
+    end
+  end
+
+  context 'Ruby' do
+    let(:agent) { 'Ruby' }
+    specify do
+      expect_meter("api.user_agent.script")
+      expect_meter("api.user_agent.script.ruby")
+      expect_meter("api.user_agent.script.ruby.vanilla")
+      get
+    end
+  end
+
+  context 'Faraday' do
+    let(:agent) { 'Faraday' }
+    specify do
+      expect_meter("api.user_agent.script")
+      expect_meter("api.user_agent.script.ruby")
+      expect_meter("api.user_agent.script.ruby.vanilla")
+      get
+    end
+  end
+
+  context 'travis.rb' do
+    let(:agent) { 'Travis/1.6.8 (Mac OS X 10.9.2 like Darwin; Ruby 2.1.1p42; RubyGems 2.0.14) Faraday/0.8.9 Typhoeus/0.6.7' }
+    specify do
+      expect_meter("api.user_agent.script")
+      expect_meter("api.user_agent.script.ruby")
+      expect_meter("api.user_agent.script.ruby.travis")
+      expect_meter("api.user_agent.script.ruby.travis.version.1.6.8")
+      expect_meter("api.user_agent.script.ruby.travis.ruby.2.1.1")
+      get
+    end
+  end
+
+  context 'Travis CLI' do
+    let(:agent) { 'Travis/1.6.8 (Mac OS X 10.10.2 like Darwin; Ruby 2.1.1; RubyGems 2.0.14; command whoami) Faraday/0.8.9 Typhoeus/0.6.7' }
+    specify do
+      expect_meter("api.user_agent.cli")
+      expect_meter("api.user_agent.cli.version.1.6.8")
+      expect_meter("api.user_agent.cli.ruby.2.1.1")
+      expect_meter("api.user_agent.cli.rubygems.2.0.14")
+      expect_meter("api.user_agent.cli.command.whoami")
+      expect_meter("api.user_agent.cli.os.darwin.mac_os_x.10.10")
+      get
+    end
+  end
+end
diff --git a/travis-api.gemspec b/travis-api.gemspec
index 7719fff7..868839c9 100644
--- a/travis-api.gemspec
+++ b/travis-api.gemspec
@@ -18,17 +18,18 @@ Gem::Specification.new do |s|
     "Henrik Hodne",
     "Andre Arko",
     "Erik Michaels-Ober",
-    "Brian Ford",
     "Steve Richert",
-    "rainsun",
-    "Bryan Goldstein",
-    "James Dennes",
-    "Nick Schonning",
+    "Brian Ford",
     "Patrick Williams",
+    "Bryan Goldstein",
     "Puneeth Chaganti",
     "Thais Camilo and Konstantin Haase",
     "Tim Carey-Smith",
-    "Zachary Scott"
+    "Zachary Scott",
+    "James Dennes",
+    "rainsun",
+    "Dan Rice",
+    "Nick Schonning"
   ]
 
   s.email = [
@@ -44,17 +45,19 @@ Gem::Specification.new do |s|
     "andre@arko.net",
     "svenfuchs@artweb-design.de",
     "sferik@gmail.com",
-    "bford@engineyard.com",
+    "henrik@travis-ci.com",
     "steve.richert@gmail.com",
-    "patrick@bittorrent.com",
-    "punchagan@muse-amuse.in",
-    "jdennes@gmail.com",
+    "bford@engineyard.com",
     "nschonni@gmail.com",
+    "brysgo@gmail.com",
+    "punchagan@muse-amuse.in",
+    "e@zzak.io",
+    "jdennes@gmail.com",
     "rainsuner@gmail.com",
     "dev+narwen+rkh@rkh.im",
     "tim@spork.in",
-    "e@zzak.io",
-    "brysgo@gmail.com"
+    "dan@zoombody.com",
+    "patrick@bittorrent.com"
   ]
 
   s.files = [
@@ -65,7 +68,6 @@ Gem::Specification.new do |s|
     "bin/start-nginx",
     "config.ru",
     "config/database.yml",
-    "config/nginx.conf.erb",
     "config/puma-config.rb",
     "config/unicorn.rb",
     "lib/tasks/build_update_branch.rake",
@@ -83,6 +85,7 @@ Gem::Specification.new do |s|
     "lib/travis/api/app/endpoint/builds.rb",
     "lib/travis/api/app/endpoint/documentation.rb",
     "lib/travis/api/app/endpoint/endpoints.rb",
+    "lib/travis/api/app/endpoint/env_vars.rb",
     "lib/travis/api/app/endpoint/home.rb",
     "lib/travis/api/app/endpoint/hooks.rb",
     "lib/travis/api/app/endpoint/jobs.rb",
@@ -91,6 +94,7 @@ Gem::Specification.new do |s|
     "lib/travis/api/app/endpoint/repos.rb",
     "lib/travis/api/app/endpoint/requests.rb",
     "lib/travis/api/app/endpoint/setting_endpoint.rb",
+    "lib/travis/api/app/endpoint/singleton_settings_endpoint.rb",
     "lib/travis/api/app/endpoint/uptime.rb",
     "lib/travis/api/app/endpoint/users.rb",
     "lib/travis/api/app/extensions.rb",
@@ -119,6 +123,7 @@ Gem::Specification.new do |s|
     "lib/travis/api/app/responders/plain.rb",
     "lib/travis/api/app/responders/service.rb",
     "lib/travis/api/app/responders/xml.rb",
+    "lib/travis/api/app/services/schedule_request.rb",
     "lib/travis/api/serializer.rb",
     "lib/travis/api/v2.rb",
     "lib/travis/api/v2/http.rb",
@@ -143,11 +148,13 @@ Gem::Specification.new do |s|
     "lib/travis/api/v2/http/request.rb",
     "lib/travis/api/v2/http/requests.rb",
     "lib/travis/api/v2/http/ssh_key.rb",
-    "lib/travis/api/v2/http/ssh_keys.rb",
     "lib/travis/api/v2/http/ssl_key.rb",
     "lib/travis/api/v2/http/user.rb",
     "lib/travis/api/v2/http/validation_error.rb",
+    "lib/travis/private_key.rb",
     "public/favicon.ico",
+    "public/images/result/canceled.png",
+    "public/images/result/canceled.svg",
     "public/images/result/error.png",
     "public/images/result/error.svg",
     "public/images/result/failing.png",
@@ -159,12 +166,14 @@ Gem::Specification.new do |s|
     "public/images/result/unknown.png",
     "public/images/result/unknown.svg",
     "script/console",
+    "script/repos_stats.rb",
     "script/server",
     "spec/integration/formats_handling_spec.rb",
     "spec/integration/responders_spec.rb",
     "spec/integration/routes.backup.rb",
     "spec/integration/scopes_spec.rb",
     "spec/integration/settings_endpoint_spec.rb",
+    "spec/integration/singleton_settings_endpoint_spec.rb",
     "spec/integration/uptime_spec.rb",
     "spec/integration/v1/branches_spec.rb",
     "spec/integration/v1/builds_spec.rb",
@@ -179,6 +188,7 @@ Gem::Specification.new do |s|
     "spec/integration/v2/repositories_spec.rb",
     "spec/integration/v2/requests_spec.rb",
     "spec/integration/v2/settings/env_vars_spec.rb",
+    "spec/integration/v2/settings/ssh_key_spec.rb",
     "spec/integration/v2/users_spec.rb",
     "spec/integration/v2_spec.backup.rb",
     "spec/integration/version_spec.rb",
@@ -194,6 +204,7 @@ Gem::Specification.new do |s|
     "spec/unit/api/v2/http/build_spec.rb",
     "spec/unit/api/v2/http/builds_spec.rb",
     "spec/unit/api/v2/http/caches_spec.rb",
+    "spec/unit/api/v2/http/env_var_spec.rb",
     "spec/unit/api/v2/http/hooks_spec.rb",
     "spec/unit/api/v2/http/job_spec.rb",
     "spec/unit/api/v2/http/jobs_spec.rb",
@@ -219,6 +230,7 @@ Gem::Specification.new do |s|
     "spec/unit/endpoint/lint_spec.rb",
     "spec/unit/endpoint/logs_spec.rb",
     "spec/unit/endpoint/repos_spec.rb",
+    "spec/unit/endpoint/requests_spec.rb",
     "spec/unit/endpoint/users_spec.rb",
     "spec/unit/endpoint_spec.rb",
     "spec/unit/extensions/expose_pattern_spec.rb",

From 950b8ce4d813c8e63a0f50fbd8ef94f6a59367ad Mon Sep 17 00:00:00 2001
From: Konstantin Haase <konstantin.mailinglists@googlemail.com>
Date: Tue, 28 Oct 2014 11:11:52 +0100
Subject: [PATCH 57/70] reduce metrics generated by UA tracker

---
 .../api/app/middleware/user_agent_tracker.rb  | 35 ++++---------------
 .../middleware/user_agent_tracker_spec.rb     | 19 ----------
 2 files changed, 6 insertions(+), 48 deletions(-)

diff --git a/lib/travis/api/app/middleware/user_agent_tracker.rb b/lib/travis/api/app/middleware/user_agent_tracker.rb
index cba98cf3..d7d582fa 100644
--- a/lib/travis/api/app/middleware/user_agent_tracker.rb
+++ b/lib/travis/api/app/middleware/user_agent_tracker.rb
@@ -37,27 +37,14 @@ class Travis::Api::App
       end
 
       def mark_travis(agent)
-        os, *rest               = agent.application.comment
-        ruby, rubygems, command = "unknown", "unknown", nil
-
-        rest.each do |comment|
-          case comment
-          when /^Ruby (\d\.\d.\d)/ then ruby     = $1
-          when /^RubyGems (.+)$/   then rubygems = $1
-          when /^command (.+)$/    then command  = $1
-          end
-        end
-
-        # "Ubuntu 12.04 like Linux" => "linux.ubuntu.12.04"
-        if os =~ /^(.+) (\S+) like (\S+)$/
-          os = "#{$3}.#{$1}.#{$2[/\d+\.\d+/]}"
-        end
+        command = agent.application.comment.detect { |c| c.start_with? "command " }
 
         if command
-          mark(:cli, version: agent.version, ruby: ruby, rubygems: rubygems, command: command, os: os)
+          mark(:cli, :version, agent.version)
+          mark(:cli, command.sub(' ', '.'))
         else
           # only track ruby version and library version for non-cli usage
-          mark(:script, :ruby, :travis, version: agent.version, ruby: ruby)
+          mark(:script, :ruby, :travis, :version, agent.version)
         end
       end
 
@@ -66,19 +53,9 @@ class Travis::Api::App
         mark(:unknown)
       end
 
-      def track_key(string)
-        string.to_s.downcase.gsub(/[^a-z0-9\-\.]+/, '_')
-      end
-
       def mark(*keys)
-        key = "api.user_agent"
-        keys.each do |subkey|
-          if subkey.is_a? Hash
-            subkey.each_pair { |k, v| ::Metriks.meter("#{key}.#{track_key(k)}.#{track_key(v)}").mark }
-          else
-            ::Metriks.meter(key << "." << track_key(subkey)).mark
-          end
-        end
+        key = "api.user_agent." << keys.map { |k| k.to_s.downcase.gsub(/[^a-z0-9\-\.]+/, '_') }.join('.')
+        ::Metriks.meter(key).mark
       end
     end
   end
diff --git a/spec/unit/middleware/user_agent_tracker_spec.rb b/spec/unit/middleware/user_agent_tracker_spec.rb
index 7fbe0c29..1e5ebe00 100644
--- a/spec/unit/middleware/user_agent_tracker_spec.rb
+++ b/spec/unit/middleware/user_agent_tracker_spec.rb
@@ -35,13 +35,11 @@ describe Travis::Api::App::Middleware::UserAgentTracker do
     let(:agent) { "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.36 Safari/537.36" }
 
     specify 'without X-User-Agent' do
-      expect_meter("api.user_agent.browser")
       expect_meter("api.user_agent.browser.unknown")
       get
     end
 
     specify 'with X-User-Agent' do
-      expect_meter("api.user_agent.browser")
       expect_meter("api.user_agent.browser.travis-web")
       get('HTTP_X_USER_AGENT' => 'travis-web')
     end
@@ -50,7 +48,6 @@ describe Travis::Api::App::Middleware::UserAgentTracker do
   context 'console' do
     let(:agent) { 'curl' }
     specify do
-      expect_meter("api.user_agent.console")
       expect_meter("api.user_agent.console.curl")
       get
     end
@@ -59,8 +56,6 @@ describe Travis::Api::App::Middleware::UserAgentTracker do
   context 'travis-api-wrapper' do
     let(:agent) { 'travis-api-wrapper - v0.01 - (cmaujean@gmail.com)' }
     specify do
-      expect_meter("api.user_agent.script")
-      expect_meter("api.user_agent.script.node_js")
       expect_meter("api.user_agent.script.node_js.travis-api-wrapper")
       get
     end
@@ -69,8 +64,6 @@ describe Travis::Api::App::Middleware::UserAgentTracker do
   context 'TravisPy' do
     let(:agent) { 'TravisPy' }
     specify do
-      expect_meter("api.user_agent.script")
-      expect_meter("api.user_agent.script.python")
       expect_meter("api.user_agent.script.python.travispy")
       get
     end
@@ -79,8 +72,6 @@ describe Travis::Api::App::Middleware::UserAgentTracker do
   context 'Ruby' do
     let(:agent) { 'Ruby' }
     specify do
-      expect_meter("api.user_agent.script")
-      expect_meter("api.user_agent.script.ruby")
       expect_meter("api.user_agent.script.ruby.vanilla")
       get
     end
@@ -89,8 +80,6 @@ describe Travis::Api::App::Middleware::UserAgentTracker do
   context 'Faraday' do
     let(:agent) { 'Faraday' }
     specify do
-      expect_meter("api.user_agent.script")
-      expect_meter("api.user_agent.script.ruby")
       expect_meter("api.user_agent.script.ruby.vanilla")
       get
     end
@@ -99,11 +88,7 @@ describe Travis::Api::App::Middleware::UserAgentTracker do
   context 'travis.rb' do
     let(:agent) { 'Travis/1.6.8 (Mac OS X 10.9.2 like Darwin; Ruby 2.1.1p42; RubyGems 2.0.14) Faraday/0.8.9 Typhoeus/0.6.7' }
     specify do
-      expect_meter("api.user_agent.script")
-      expect_meter("api.user_agent.script.ruby")
-      expect_meter("api.user_agent.script.ruby.travis")
       expect_meter("api.user_agent.script.ruby.travis.version.1.6.8")
-      expect_meter("api.user_agent.script.ruby.travis.ruby.2.1.1")
       get
     end
   end
@@ -111,12 +96,8 @@ describe Travis::Api::App::Middleware::UserAgentTracker do
   context 'Travis CLI' do
     let(:agent) { 'Travis/1.6.8 (Mac OS X 10.10.2 like Darwin; Ruby 2.1.1; RubyGems 2.0.14; command whoami) Faraday/0.8.9 Typhoeus/0.6.7' }
     specify do
-      expect_meter("api.user_agent.cli")
       expect_meter("api.user_agent.cli.version.1.6.8")
-      expect_meter("api.user_agent.cli.ruby.2.1.1")
-      expect_meter("api.user_agent.cli.rubygems.2.0.14")
       expect_meter("api.user_agent.cli.command.whoami")
-      expect_meter("api.user_agent.cli.os.darwin.mac_os_x.10.10")
       get
     end
   end

From c0418c3cfbef57ea8c027fab08cf22de84656656 Mon Sep 17 00:00:00 2001
From: Hiro Asari <asari.ruby@gmail.com>
Date: Tue, 28 Oct 2014 10:56:26 -0400
Subject: [PATCH 58/70] Update travis-core

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 3255c6fa..c9668d88 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -36,7 +36,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-core.git
-  revision: da5902bf0cbf1d4031bb4a6c7e7c82ff35ecc414
+  revision: 791d0e8224f2ce322ff20f9098ebd74953bcd236
   branch: sf-hiro-bugfix
   specs:
     travis-core (0.0.1)

From 0ebdee564dbf8323b7e3481cffd702546014904f Mon Sep 17 00:00:00 2001
From: Hiro Asari <asari.ruby@gmail.com>
Date: Tue, 28 Oct 2014 12:06:53 -0400
Subject: [PATCH 59/70] Update travis-core

---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index c9668d88..59fe3b65 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -7,7 +7,7 @@ GIT
 
 GIT
   remote: git://github.com/getsentry/raven-ruby.git
-  revision: 1e12d8d5c288e97fd2fd64d28c2ffb7cad439eb2
+  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: 791d0e8224f2ce322ff20f9098ebd74953bcd236
+  revision: 624dd8f5e476d05ae86dc422035691516cd3d750
   branch: sf-hiro-bugfix
   specs:
     travis-core (0.0.1)

From 326956fe270329215fc8f28f9a488e830d6c0c12 Mon Sep 17 00:00:00 2001
From: Hiro Asari <asari.ruby@gmail.com>
Date: Tue, 28 Oct 2014 12:40:25 -0400
Subject: [PATCH 60/70] Update travis-core

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 59fe3b65..b5297d3b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -36,7 +36,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-core.git
-  revision: 624dd8f5e476d05ae86dc422035691516cd3d750
+  revision: fc676ed0c3cf4c28979a6f47a25fd34cdd94906b
   branch: sf-hiro-bugfix
   specs:
     travis-core (0.0.1)

From b8f9401023d05da511bbf1802f1176c7524fae1e Mon Sep 17 00:00:00 2001
From: Hiro Asari <asari.ruby@gmail.com>
Date: Tue, 28 Oct 2014 12:48:26 -0400
Subject: [PATCH 61/70] Update travis-core

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index b5297d3b..9fc9d11c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -36,7 +36,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-core.git
-  revision: fc676ed0c3cf4c28979a6f47a25fd34cdd94906b
+  revision: 86268a941ccf27c13ecd55935b7fad358f294427
   branch: sf-hiro-bugfix
   specs:
     travis-core (0.0.1)

From f3731e3929b6e1df8c5a68bdd93a13da05e39e5d Mon Sep 17 00:00:00 2001
From: Hiro Asari <asari.ruby@gmail.com>
Date: Tue, 28 Oct 2014 13:32:52 -0400
Subject: [PATCH 62/70] Update travis-core

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 9fc9d11c..342e8a74 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -36,7 +36,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-core.git
-  revision: 86268a941ccf27c13ecd55935b7fad358f294427
+  revision: f29e6bb0271aea3662017db29d6706a419cc3605
   branch: sf-hiro-bugfix
   specs:
     travis-core (0.0.1)

From 597f2aa53f3cb551ed24786cf0b44462f6027a66 Mon Sep 17 00:00:00 2001
From: Hiro Asari <asari.ruby@gmail.com>
Date: Wed, 29 Oct 2014 08:58:56 -0400
Subject: [PATCH 63/70] Update travis-core

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 342e8a74..7d39be59 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -36,7 +36,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-core.git
-  revision: f29e6bb0271aea3662017db29d6706a419cc3605
+  revision: 69f5f21ce8d6c9c63408705c4f32cb8fc08cea57
   branch: sf-hiro-bugfix
   specs:
     travis-core (0.0.1)

From 7e2334c69fc66977eddeea444289559e82525343 Mon Sep 17 00:00:00 2001
From: Hiro Asari <asari.ruby@gmail.com>
Date: Wed, 29 Oct 2014 11:40:32 -0400
Subject: [PATCH 64/70] Update travis-core

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 7d39be59..671d142e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -36,7 +36,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-core.git
-  revision: 69f5f21ce8d6c9c63408705c4f32cb8fc08cea57
+  revision: 2bbd75226593cd1dbd6fd52abe5f22bf70cea819
   branch: sf-hiro-bugfix
   specs:
     travis-core (0.0.1)

From 36b639eaf36f4d6d17ddd79c4a1ad8b7626422de Mon Sep 17 00:00:00 2001
From: Hiro Asari <asari.ruby@gmail.com>
Date: Wed, 29 Oct 2014 16:19:37 -0400
Subject: [PATCH 65/70] Switch back to travis-core master branch

https://github.com/travis-ci/travis-core/pull/404 has been merged
---
 Gemfile      | 2 +-
 Gemfile.lock | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index a3e35857..0e4250f8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ ruby '2.1.2'
 source 'https://rubygems.org'
 gemspec
 
-gem 'travis-core',     github: 'travis-ci/travis-core', branch: 'sf-hiro-bugfix'
+gem 'travis-core',     github: 'travis-ci/travis-core'
 gem 'travis-support',  github: 'travis-ci/travis-support'
 gem 'travis-config',   '~> 0.1.0'
 gem 'travis-sidekiqs', github: 'travis-ci/travis-sidekiqs', require: nil, ref: 'cde9741'
diff --git a/Gemfile.lock b/Gemfile.lock
index 671d142e..aa56e783 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -36,8 +36,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-core.git
-  revision: 2bbd75226593cd1dbd6fd52abe5f22bf70cea819
-  branch: sf-hiro-bugfix
+  revision: b4c4ae9beb6ba8d813491273dc75fa582ee719b0
   specs:
     travis-core (0.0.1)
       actionmailer (~> 3.2.19)

From 2daab878a94988cecb535b401dcefabd1b7af6ff Mon Sep 17 00:00:00 2001
From: Hiro Asari <asari.ruby@gmail.com>
Date: Wed, 29 Oct 2014 19:30:33 -0400
Subject: [PATCH 66/70] Relax SQL query requirements in specs

This corresponds to some extra work done when build matrix
is expanded.

See https://github.com/travis-ci/travis-core/pull/404
---
 spec/unit/api/v2/http/build_spec.rb  | 2 +-
 spec/unit/api/v2/http/builds_spec.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/unit/api/v2/http/build_spec.rb b/spec/unit/api/v2/http/build_spec.rb
index a7ed68d8..ca97654e 100644
--- a/spec/unit/api/v2/http/build_spec.rb
+++ b/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
 
diff --git a/spec/unit/api/v2/http/builds_spec.rb b/spec/unit/api/v2/http/builds_spec.rb
index 73c98378..da9a7c43 100644
--- a/spec/unit/api/v2/http/builds_spec.rb
+++ b/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
 

From c3a25959c93b857badcc3ad7eb1dbd966c9dbd2c Mon Sep 17 00:00:00 2001
From: Hiro Asari <asari.ruby@gmail.com>
Date: Wed, 29 Oct 2014 19:34:50 -0400
Subject: [PATCH 67/70] Update GC-related env var

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index fbca476d..56e79126 100644
--- a/.travis.yml
+++ b/.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:

From 467de34c018925f39c2e2e92cb086bb508afc694 Mon Sep 17 00:00:00 2001
From: Dan Buch <dan@travis-ci.org>
Date: Mon, 3 Nov 2014 12:47:39 -0500
Subject: [PATCH 68/70] Bumping ref for travis-yaml

to include addons.ssh_known_hosts node bits.
---
 Gemfile      | 2 +-
 Gemfile.lock | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index b53a1b08..fe5d21d4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,4 @@
-ruby '2.1.2'
+ruby '2.1.2' if ENV.key?('DYNO')
 
 source 'https://rubygems.org'
 gemspec
diff --git a/Gemfile.lock b/Gemfile.lock
index f2651e11..77cf9527 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -74,7 +74,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-yaml.git
-  revision: 2c6ac75077123095e2ee8e8db435342ba2d03c2d
+  revision: 797edde6d0d009c827523a765ab84262fa6d56db
   specs:
     travis-yaml (0.1.0)
 

From 018f3c6872e1c0cc385a23a3c0886003cbaa347d Mon Sep 17 00:00:00 2001
From: Dan Buch <dan@travis-ci.org>
Date: Mon, 3 Nov 2014 13:42:00 -0500
Subject: [PATCH 69/70] Moving the useragent dependency to gemspec

so that it gets installed when using travis-api as a gem.
---
 Gemfile            | 1 -
 Gemfile.lock       | 2 +-
 travis-api.gemspec | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index fe5d21d4..a7998671 100644
--- a/Gemfile
+++ b/Gemfile
@@ -25,7 +25,6 @@ gem 'pry'
 gem 'metriks',         '0.9.9.6'
 gem 'metriks-librato_metrics', github: 'eric/metriks-librato_metrics'
 gem 'micro_migrations'
-gem 'useragent'
 
 group :test do
   gem 'rspec',         '~> 2.13'
diff --git a/Gemfile.lock b/Gemfile.lock
index 77cf9527..2e50684c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -93,6 +93,7 @@ PATH
       thin (~> 1.4)
       travis-core
       travis-support
+      useragent
 
 GEM
   remote: https://rubygems.org/
@@ -363,5 +364,4 @@ DEPENDENCIES
   travis-support!
   travis-yaml!
   unicorn
-  useragent
   yard-sinatra!
diff --git a/travis-api.gemspec b/travis-api.gemspec
index 868839c9..8e3615c6 100644
--- a/travis-api.gemspec
+++ b/travis-api.gemspec
@@ -259,5 +259,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'rack-ssl',        '~> 1.3', '>= 1.3.3'
   s.add_dependency 'rack-contrib',    '~> 1.1'
   s.add_dependency 'memcachier'
+  s.add_dependency 'useragent'
 end
 

From 57a82b7c1d37eba05ec35348a9b1dc8cb893effb Mon Sep 17 00:00:00 2001
From: Dan Buch <dan@travis-ci.org>
Date: Tue, 11 Nov 2014 12:37:52 -0500
Subject: [PATCH 70/70] Bumping ref for travis-yaml

plus other stuff that's along for the ride
---
 .ruby-version      |  1 +
 .travis.yml        | 20 +++++++++-----------
 Gemfile            |  2 --
 Gemfile.lock       |  2 +-
 travis-api.gemspec | 24 ++++++++++++++----------
 5 files changed, 25 insertions(+), 24 deletions(-)
 create mode 100644 .ruby-version

diff --git a/.ruby-version b/.ruby-version
new file mode 100644
index 00000000..7d2ed7c7
--- /dev/null
+++ b/.ruby-version
@@ -0,0 +1 @@
+2.1.4
diff --git a/.travis.yml b/.travis.yml
index 56e79126..4bc87dd6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,19 +1,17 @@
-sudo: false
 language: ruby
+sudo: false
+rvm:
+- 2.1.4
 env:
   global:
-    - RUBY_GC_MALLOC_LIMIT=90000000
-    - RUBY_GC_HEAP_FREE_SLOTS=200000
-rvm:
-  - 2.1.2
+  - RUBY_GC_MALLOC_LIMIT=90000000
+  - RUBY_GC_HEAP_FREE_SLOTS=200000
+cache: bundler
 addons:
   postgresql: 9.3
+services:
+- redis
 before_script:
-  - 'RAILS_ENV=test bundle exec rake db:create db:migrate --trace'
-
+- 'RAILS_ENV=test bundle exec rake db:create db:migrate --trace'
 notifications:
   irc: "irc.freenode.org#travis"
-services:
-  - redis
-cache: bundler
-sudo: false
diff --git a/Gemfile b/Gemfile
index a7998671..d92fda3e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,3 @@
-ruby '2.1.2' if ENV.key?('DYNO')
-
 source 'https://rubygems.org'
 gemspec
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 2e50684c..1e6dbf5c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -74,7 +74,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-yaml.git
-  revision: 797edde6d0d009c827523a765ab84262fa6d56db
+  revision: 08ec0c4d0cf3366cd971d4acd9aadbc0db68f85d
   specs:
     travis-yaml (0.1.0)
 
diff --git a/travis-api.gemspec b/travis-api.gemspec
index 8e3615c6..6f8d3185 100644
--- a/travis-api.gemspec
+++ b/travis-api.gemspec
@@ -12,15 +12,15 @@ Gem::Specification.new do |s|
     "Piotr Sarnacki",
     "Konstantin Haase",
     "Sven Fuchs",
-    "Mathias Meyer",
     "Hiro Asari",
+    "Mathias Meyer",
     "Josh Kalderimis",
     "Henrik Hodne",
     "Andre Arko",
     "Erik Michaels-Ober",
+    "Dan Buch",
     "Steve Richert",
     "Brian Ford",
-    "Patrick Williams",
     "Bryan Goldstein",
     "Puneeth Chaganti",
     "Thais Camilo and Konstantin Haase",
@@ -29,15 +29,16 @@ Gem::Specification.new do |s|
     "James Dennes",
     "rainsun",
     "Dan Rice",
-    "Nick Schonning"
+    "Nick Schonning",
+    "Patrick Williams"
   ]
 
   s.email = [
     "drogus@gmail.com",
     "konstantin.mailinglists@googlemail.com",
     "me@svenfuchs.com",
-    "meyer@paperplanes.de",
     "asari.ruby@gmail.com",
+    "meyer@paperplanes.de",
     "josh.kalderimis@gmail.com",
     "me@henrikhodne.com",
     "henrik@hodne.io",
@@ -45,19 +46,20 @@ Gem::Specification.new do |s|
     "andre@arko.net",
     "svenfuchs@artweb-design.de",
     "sferik@gmail.com",
-    "henrik@travis-ci.com",
+    "dan@travis-ci.org",
     "steve.richert@gmail.com",
     "bford@engineyard.com",
-    "nschonni@gmail.com",
-    "brysgo@gmail.com",
+    "henrik@travis-ci.com",
     "punchagan@muse-amuse.in",
-    "e@zzak.io",
-    "jdennes@gmail.com",
     "rainsuner@gmail.com",
     "dev+narwen+rkh@rkh.im",
     "tim@spork.in",
+    "e@zzak.io",
+    "jdennes@gmail.com",
     "dan@zoombody.com",
-    "patrick@bittorrent.com"
+    "nschonni@gmail.com",
+    "patrick@bittorrent.com",
+    "brysgo@gmail.com"
   ]
 
   s.files = [
@@ -114,6 +116,7 @@ Gem::Specification.new do |s|
     "lib/travis/api/app/middleware/metriks.rb",
     "lib/travis/api/app/middleware/rewrite.rb",
     "lib/travis/api/app/middleware/scope_check.rb",
+    "lib/travis/api/app/middleware/user_agent_tracker.rb",
     "lib/travis/api/app/responders.rb",
     "lib/travis/api/app/responders/atom.rb",
     "lib/travis/api/app/responders/badge.rb",
@@ -241,6 +244,7 @@ Gem::Specification.new do |s|
     "spec/unit/helpers/json_renderer_spec.rb",
     "spec/unit/middleware/logging_spec.rb",
     "spec/unit/middleware/scope_check_spec.rb",
+    "spec/unit/middleware/user_agent_tracker_spec.rb",
     "spec/unit/responders/json_spec.rb",
     "spec/unit/responders/service_spec.rb",
     "tmp/.gitkeep",