Permalink
Browse files

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

  • Loading branch information...
2 parents 17dcde1 + 86d14fa commit 2ebed41225c4b9042a4b383813719e35ab4701cb @technoweenie technoweenie committed Apr 26, 2011
Showing with 3 additions and 9 deletions.
  1. +3 −2 gollum.gemspec
  2. +0 −3 lib/gollum.rb
  3. +0 −1 lib/gollum/frontend/public/css/gollum.css
  4. +0 −3 lib/gollum/ruby1.8.rb
View
@@ -5,7 +5,7 @@ Gem::Specification.new do |s|
s.name = 'gollum'
s.version = '1.2.0'
- s.date = '2011-03-31'
+ s.date = '2011-04-15'
s.rubyforge_project = 'gollum'
s.summary = "A simple, Git-powered wiki."
@@ -697,6 +697,7 @@ Gem::Specification.new do |s|
lib/gollum/frontend/templates/history.mustache
lib/gollum/frontend/templates/layout.mustache
lib/gollum/frontend/templates/page.mustache
+ lib/gollum/frontend/templates/pages.mustache
lib/gollum/frontend/templates/search.mustache
lib/gollum/frontend/templates/searchbar.mustache
lib/gollum/frontend/views/compare.rb
@@ -707,12 +708,12 @@ Gem::Specification.new do |s|
lib/gollum/frontend/views/history.rb
lib/gollum/frontend/views/layout.rb
lib/gollum/frontend/views/page.rb
+ lib/gollum/frontend/views/pages.rb
lib/gollum/frontend/views/search.rb
lib/gollum/git_access.rb
lib/gollum/markup.rb
lib/gollum/page.rb
lib/gollum/pagination.rb
- lib/gollum/ruby1.8.rb
lib/gollum/sanitization.rb
lib/gollum/wiki.rb
templates/formatting.html
View
@@ -7,9 +7,6 @@
require 'github/markup'
require 'sanitize'
-# ruby 1.8 compatibility
-require 'gollum/ruby1.8'
-
# internal
require 'gollum/git_access'
require 'gollum/committer'
@@ -42,7 +42,6 @@ a:hover, a:visited {
line-height: normal;
margin: 0;
padding: 0.08em 0 0 0;
- width: 50%;
}
#head ul.actions {
@@ -1,3 +0,0 @@
-class String
- alias :lines :to_a if defined?(RUBY_VERSION) && RUBY_VERSION < '1.9'
-end

0 comments on commit 2ebed41

Please sign in to comment.