search

imathis / octopress

Octopress is an obsessively designed framework for Jekyll blogging. It’s easy to configure and easy to deploy. Sweet huh?
http://github.com/imathis/octopress
9.32k stars 2.62k forks source link

Duplicated Github CoffeeScript... #1217

Open MrJoy opened 11 years ago

MrJoy commented 11 years ago

This is on the current 2.1 branch. With the exception of one line, they're identical:

$ diff -u .themes/classic/assets/javascripts/github{.coffee,-repos.coffee}
--- .themes/classic/assets/javascripts/github.coffee    2013-04-10 10:29:01.000000000 -0700
+++ .themes/classic/assets/javascripts/github-repos.coffee  2013-04-10 10:29:01.000000000 -0700
@@ -25,7 +25,7 @@
       filter.push i.trim().toLowerCase() for i in options.repos.split ','

     for repo in repos
-      unless repoList.length is options.count and options.count > 1
+      unless repoList.length is options.count
         if options.forks or options.watchers
           repo.meta  = ''
           if options.watchers

They were both added as part of the same commit (7bdab0e65c86d8bd9fe3b46a4bf1ca92b1e1a54e) so I'm not sure which is the 'proper' one.

parkr commented 11 years ago

We want the first one, then. Weird. @imathis?

MrJoy commented 11 years ago

First one? You mean github.coffee?

I'll leave it to you to nuke the irrelevant one...

parkr commented 11 years ago

coo coo, will do

mockra commented 10 years ago

It looks like this has been fixed. Can we close this issue?