From ba6b5b7cba5e979bed4a28e020843ca1da090283 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9e=20Hendricksen?= <renee@travis-ci.org>
Date: Sun, 14 Aug 2016 16:54:34 -0400
Subject: [PATCH 1/6] add some debug for testing staging

---
 lib/travis/model/job.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/travis/model/job.rb b/lib/travis/model/job.rb
index 1aac654e..6c604a96 100644
--- a/lib/travis/model/job.rb
+++ b/lib/travis/model/job.rb
@@ -174,6 +174,7 @@ class Job < Travis::Model
     end
 
     def normalize_config(config)
+      puts "**DEBUG:*** #{config.inspect}"
       config = config ? config.deep_symbolize_keys : {}
 
       if config[:deploy]

From b3e8b9d43b6ab0666124dd16d8bc8fb69e620f0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9e=20Hendricksen?= <renee@travis-ci.org>
Date: Sun, 14 Aug 2016 17:26:03 -0400
Subject: [PATCH 2/6] more debug output

---
 lib/travis/api/serialize/v1/http/build.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/travis/api/serialize/v1/http/build.rb b/lib/travis/api/serialize/v1/http/build.rb
index 295199a9..ebe11e5d 100644
--- a/lib/travis/api/serialize/v1/http/build.rb
+++ b/lib/travis/api/serialize/v1/http/build.rb
@@ -17,6 +17,8 @@ module Travis
             end
 
             def data
+              puts "***DEBUG1:*** #{build.matrix.first.inspect}"
+              puts "***DEBUG2:*** #{Job.new(build.matrix.first).inspect}"
               {
                 'id' => build.id,
                 'repository_id' => build.repository_id,

From 51575bdb896b740b082dceba3ea691b119aecfcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9e=20Hendricksen?= <renee@travis-ci.org>
Date: Sun, 14 Aug 2016 18:16:05 -0400
Subject: [PATCH 3/6] this fixes the error

---
 lib/travis/api/serialize/v1/http/build.rb | 2 --
 lib/travis/model/job.rb                   | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/travis/api/serialize/v1/http/build.rb b/lib/travis/api/serialize/v1/http/build.rb
index ebe11e5d..295199a9 100644
--- a/lib/travis/api/serialize/v1/http/build.rb
+++ b/lib/travis/api/serialize/v1/http/build.rb
@@ -17,8 +17,6 @@ module Travis
             end
 
             def data
-              puts "***DEBUG1:*** #{build.matrix.first.inspect}"
-              puts "***DEBUG2:*** #{Job.new(build.matrix.first).inspect}"
               {
                 'id' => build.id,
                 'repository_id' => build.repository_id,
diff --git a/lib/travis/model/job.rb b/lib/travis/model/job.rb
index 6c604a96..74eb2ce7 100644
--- a/lib/travis/model/job.rb
+++ b/lib/travis/model/job.rb
@@ -174,7 +174,7 @@ class Job < Travis::Model
     end
 
     def normalize_config(config)
-      puts "**DEBUG:*** #{config.inspect}"
+      config = YAML.load(config) if config.is_a? String
       config = config ? config.deep_symbolize_keys : {}
 
       if config[:deploy]

From 17ccc22fbe5ee76be2eb9fb3f9161375cbffdcf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9e=20Hendricksen?= <renee@travis-ci.org>
Date: Sun, 14 Aug 2016 19:23:22 -0400
Subject: [PATCH 4/6] fix the atom bug

---
 lib/travis/api/app/responders/atom.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/travis/api/app/responders/atom.rb b/lib/travis/api/app/responders/atom.rb
index 8bdd3e44..bf7f6c3d 100644
--- a/lib/travis/api/app/responders/atom.rb
+++ b/lib/travis/api/app/responders/atom.rb
@@ -4,15 +4,15 @@ module Travis::Api::App::Responders
   class Atom < Base
     ATOM_FEED_ERB = ERB.new <<-EOF
 <?xml version="1.0" encoding="utf-8"?>
- 
+
 <feed xmlns="http://www.w3.org/2005/Atom">
- 
+
   <title><%= resource.first.repository.slug %> Builds</title>
   <link href="<%= endpoint.url %>" type="application/atom+xml" rel = "self" />
   <id>repo:<%= resource.first.repository.id %></id>
   <rights>Copyright (c) <%= DateTime.now.strftime("%Y") %> Travis CI GmbH</rights>
   <updated><%= DateTime.now.rfc3339 %></updated>
- 
+
   <% resource.each do |build| %>
   <entry>
     <title><%= build.repository.slug %> Build #<%= build.number %></title>
@@ -21,7 +21,7 @@ module Travis::Api::App::Responders
     <updated><%= ::DateTime.parse(build.updated_at.to_s).rfc3339 %></updated>
     <summary type="html">
     &lt;p&gt;
-      <%= build.commit.message.encode(:xml => :text) %> (<%= build.commit.committer_name %>)
+      <%= build.commit.message.encode(:xml => :text) if build.commit.message %> (<%= build.commit.committer_name %>)
       &lt;br/&gt;&lt;br/&gt;
       State: <%= build.state %>
       &lt;br/&gt;
@@ -36,7 +36,7 @@ module Travis::Api::App::Responders
     </author>
   </entry>
   <% end %>
- 
+
 </feed>
     EOF
 

From 65aece922c46fa39171fa290b1ed118d22c15431 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9e=20Hendricksen?= <renee@travis-ci.org>
Date: Sun, 14 Aug 2016 20:35:11 -0400
Subject: [PATCH 5/6] fix another sentry error

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

diff --git a/lib/travis/features.rb b/lib/travis/features.rb
index 4ed075a1..5b2f82d2 100644
--- a/lib/travis/features.rb
+++ b/lib/travis/features.rb
@@ -123,7 +123,7 @@ module Travis
     end
 
     def owner_key(feature, owner)
-      suffix = owner.class.table_name
+      suffix = owner.class.table_name if owner
       "#{key(feature)}:#{suffix}"
     end
 

From ca80c7f0a22158448ec4bf5f550472985ec01749 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9e=20Hendricksen?= <renee@travis-ci.org>
Date: Sun, 14 Aug 2016 21:05:56 -0400
Subject: [PATCH 6/6] fix another sentry error

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

diff --git a/lib/travis/features.rb b/lib/travis/features.rb
index 5b2f82d2..a93fe86a 100644
--- a/lib/travis/features.rb
+++ b/lib/travis/features.rb
@@ -111,6 +111,7 @@ module Travis
     #
     # By default, this return false.
     def owner_active?(feature, owner)
+      return false unless owner
       redis.sismember(owner_key(feature, owner), owner.id)
     end