suzanne.soy/travis-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jc-v3-logs

Browse Source
This commit is contained in:
Renée Hendricksen 2016-08-14 20:53:40 -04:00 committed by GitHub
commit ce7adf5090
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/travis/api/app/responders/atom.rb
View File

@ -21,7 +21,7 @@ module Travis::Api::App::Responders
<updated><%= ::DateTime.parse(build.updated_at.to_s).rfc3339 %></updated> <updated><%= ::DateTime.parse(build.updated_at.to_s).rfc3339 %></updated>
<summary type="html"> <summary type="html">
&lt;p&gt; &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; &lt;br/&gt;&lt;br/&gt;
State: <%= build.state %> State: <%= build.state %>
&lt;br/&gt; &lt;br/&gt;

2
lib/travis/features.rb
View File

@ -123,7 +123,7 @@ module Travis
end end
def owner_key(feature, owner) def owner_key(feature, owner)
suffix = owner.class.table_name suffix = owner.class.table_name if owner
"#{key(feature)}:#{suffix}" "#{key(feature)}:#{suffix}"
end end

1
lib/travis/model/job.rb
View File

@ -174,6 +174,7 @@ class Job < Travis::Model
end end
def normalize_config(config) def normalize_config(config)
config = YAML.load(config) if config.is_a? String
config = config ? config.deep_symbolize_keys : {} config = config ? config.deep_symbolize_keys : {}
if config[:deploy] if config[:deploy]