Sync changes from upstream repository

Hubot · Hubot · commit 9b74cd52bb52 · 2014-10-09T00:13:05.000Z
diff --git a/lib/resources.rb b/lib/resources.rb
@@ -1714,7 +1714,8 @@ def fetch_content(key)
     META ||= {
       :hooks => ['127.0.0.1/32'],
       :git => ['127.0.0.1/32'],
-      :verifiable_password_authentication => true
+      :verifiable_password_authentication => true,
+      :github_services_sha => "3a0f86fb8db8eea7ccbb9a95f325ddbedfb25e15"
     }
 
     BLOB ||= {

Original file line number	Diff line number	Diff line change
`@@ -1714,7 +1714,8 @@ def fetch_content(key)`
`1714`	`1714`	`META \|\|= {`
`1715`	`1715`	`:hooks => ['127.0.0.1/32'],`
`1716`	`1716`	`:git => ['127.0.0.1/32'],`
`1717`		`- :verifiable_password_authentication => true`
	`1717`	`+ :verifiable_password_authentication => true,`
	`1718`	`+ :github_services_sha => "3a0f86fb8db8eea7ccbb9a95f325ddbedfb25e15"`
`1718`	`1719`	`}`
`1719`	`1720`
`1720`	`1721`	`BLOB \|\|= {`