Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'master' of github.com:github/gollum

  • Loading branch information...
commit 2ebed41225c4b9042a4b383813719e35ab4701cb 2 parents 17dcde1 + 86d14fa
risk danger olson authored
5  gollum.gemspec
@@ -5,7 +5,7 @@ Gem::Specification.new do |s|
5 5
 
6 6
   s.name              = 'gollum'
7 7
   s.version           = '1.2.0'
8  
-  s.date              = '2011-03-31'
  8
+  s.date              = '2011-04-15'
9 9
   s.rubyforge_project = 'gollum'
10 10
 
11 11
   s.summary     = "A simple, Git-powered wiki."
@@ -697,6 +697,7 @@ Gem::Specification.new do |s|
697 697
     lib/gollum/frontend/templates/history.mustache
698 698
     lib/gollum/frontend/templates/layout.mustache
699 699
     lib/gollum/frontend/templates/page.mustache
  700
+    lib/gollum/frontend/templates/pages.mustache
700 701
     lib/gollum/frontend/templates/search.mustache
701 702
     lib/gollum/frontend/templates/searchbar.mustache
702 703
     lib/gollum/frontend/views/compare.rb
@@ -707,12 +708,12 @@ Gem::Specification.new do |s|
707 708
     lib/gollum/frontend/views/history.rb
708 709
     lib/gollum/frontend/views/layout.rb
709 710
     lib/gollum/frontend/views/page.rb
  711
+    lib/gollum/frontend/views/pages.rb
710 712
     lib/gollum/frontend/views/search.rb
711 713
     lib/gollum/git_access.rb
712 714
     lib/gollum/markup.rb
713 715
     lib/gollum/page.rb
714 716
     lib/gollum/pagination.rb
715  
-    lib/gollum/ruby1.8.rb
716 717
     lib/gollum/sanitization.rb
717 718
     lib/gollum/wiki.rb
718 719
     templates/formatting.html
3  lib/gollum.rb
@@ -7,9 +7,6 @@
7 7
 require 'github/markup'
8 8
 require 'sanitize'
9 9
 
10  
-# ruby 1.8 compatibility
11  
-require 'gollum/ruby1.8'
12  
-
13 10
 # internal
14 11
 require 'gollum/git_access'
15 12
 require 'gollum/committer'
1  lib/gollum/frontend/public/css/gollum.css
@@ -42,7 +42,6 @@ a:hover, a:visited {
42 42
     line-height: normal;
43 43
     margin: 0;
44 44
     padding: 0.08em 0 0 0;
45  
-    width: 50%;
46 45
   }
47 46
   
48 47
   #head ul.actions {
3  lib/gollum/ruby1.8.rb
... ...
@@ -1,3 +0,0 @@
1  
-class String
2  
-  alias :lines :to_a if defined?(RUBY_VERSION) && RUBY_VERSION < '1.9'
3  
-end

0 notes on commit 2ebed41

Please sign in to comment.
Something went wrong with that request. Please try again.