Merge branch 'master' of github.com:codeschool/javascript.com

jameswritescode · jameswritescode · commit 83d2f3fa2fc7 · 2015-09-26T23:21:33.000-04:00
For some reason I could not avoid doing this.
diff --git a/server/services/articles.js b/server/services/articles.js
@@ -16,7 +16,7 @@ var Articles = {
   // along with user infomation.
   recent(cb) {
     db.query(
-      'SELECT a.news, a.url, a.title, a.slug, a.body, a.published_at, u.name, u.avatar_url, (SELECT COUNT(*) FROM comments WHERE article_id = a.id) AS comment_count FROM articles AS a LEFT JOIN users AS u ON a.user_id = u.id WHERE a.id IN (SELECT id FROM articles WHERE news = true AND approved = true ORDER BY published_at DESC LIMIT 13) OR a.id IN (SELECT id FROM articles WHERE news = false AND approved = true ORDER BY published_at DESC LIMIT 25) ORDER BY published_at DESC;',
+      'SELECT a.news, a.url, a.title, a.slug, a.body, a.published_at, u.name, u.avatar_url, (SELECT COUNT(*) FROM comments WHERE article_id = a.id) AS comment_count FROM articles AS a LEFT JOIN users AS u ON a.user_id = u.id WHERE a.id IN (SELECT id FROM articles WHERE news = true AND approved = true ORDER BY published_at DESC LIMIT 10) OR a.id IN (SELECT id FROM articles WHERE news = false AND approved = true ORDER BY published_at DESC LIMIT 25) ORDER BY published_at DESC;',
       [],
       cb
     )

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ var Articles = {`
`16`	`16`	`// along with user infomation.`
`17`	`17`	`recent(cb) {`
`18`	`18`	`db.query(`
`19`		`- 'SELECT a.news, a.url, a.title, a.slug, a.body, a.published_at, u.name, u.avatar_url, (SELECT COUNT(*) FROM comments WHERE article_id = a.id) AS comment_count FROM articles AS a LEFT JOIN users AS u ON a.user_id = u.id WHERE a.id IN (SELECT id FROM articles WHERE news = true AND approved = true ORDER BY published_at DESC LIMIT 13) OR a.id IN (SELECT id FROM articles WHERE news = false AND approved = true ORDER BY published_at DESC LIMIT 25) ORDER BY published_at DESC;',`
	`19`	`+ 'SELECT a.news, a.url, a.title, a.slug, a.body, a.published_at, u.name, u.avatar_url, (SELECT COUNT(*) FROM comments WHERE article_id = a.id) AS comment_count FROM articles AS a LEFT JOIN users AS u ON a.user_id = u.id WHERE a.id IN (SELECT id FROM articles WHERE news = true AND approved = true ORDER BY published_at DESC LIMIT 10) OR a.id IN (SELECT id FROM articles WHERE news = false AND approved = true ORDER BY published_at DESC LIMIT 25) ORDER BY published_at DESC;',`
`20`	`20`	`[],`
`21`	`21`	`cb`
`22`	`22`	`)`