Merge remote-tracking branch 'upstream/master' into per-page-uploads

Conflicts: lib/gollum/public/gollum/javascript/gollum.js
2014-01-03 17:49:53 +11:00
parent 5eac24eacb 3fd16daeca
commit d1fb98cf1b
7 changed files with 28 additions and 7 deletions
@@ -35,6 +35,10 @@ module Precious
        first.authored_date.strftime(DATE_FORMAT)
      end

+      def noindex
+        @version ? true : false
+      end
+
      def editable
        @editable
      end