From 2a052cae8d0881a689b6d5e7decb391520ed2b1e Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Sun, 10 Apr 2011 22:28:37 -0700 Subject: [PATCH 1/3] Remove default width of page name header. --- lib/gollum/frontend/public/css/gollum.css | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/gollum/frontend/public/css/gollum.css b/lib/gollum/frontend/public/css/gollum.css index 612b27ae..cec9301f 100755 --- a/lib/gollum/frontend/public/css/gollum.css +++ b/lib/gollum/frontend/public/css/gollum.css @@ -42,7 +42,6 @@ a:hover, a:visited { line-height: normal; margin: 0; padding: 0.08em 0 0 0; - width: 50%; } #head ul.actions { From df505a72899f4d0d9ed30131b030d465b2a748ae Mon Sep 17 00:00:00 2001 From: Tom Ward Date: Tue, 12 Apr 2011 15:23:23 +0100 Subject: [PATCH 2/3] ruby1.8 compatibility isn't required to run gollum using ruby 1.8.7 The sanitize gem requires 1.8.7 or later, so compatibility with earlier versions is moot --- lib/gollum.rb | 3 --- lib/gollum/ruby1.8.rb | 3 --- 2 files changed, 6 deletions(-) delete mode 100644 lib/gollum/ruby1.8.rb diff --git a/lib/gollum.rb b/lib/gollum.rb index e354e90c..41cd566c 100644 --- a/lib/gollum.rb +++ b/lib/gollum.rb @@ -7,9 +7,6 @@ require 'grit' require 'github/markup' require 'sanitize' -# ruby 1.8 compatibility -require 'gollum/ruby1.8' - # internal require 'gollum/git_access' require 'gollum/committer' diff --git a/lib/gollum/ruby1.8.rb b/lib/gollum/ruby1.8.rb deleted file mode 100644 index d24d5f29..00000000 --- a/lib/gollum/ruby1.8.rb +++ /dev/null @@ -1,3 +0,0 @@ -class String - alias :lines :to_a if defined?(RUBY_VERSION) && RUBY_VERSION < '1.9' -end From 3d591b49cb66877ba6ebc9016611c62ea265662f Mon Sep 17 00:00:00 2001 From: Chris Roos Date: Fri, 15 Apr 2011 15:53:18 +0100 Subject: [PATCH 3/3] Updated the gemspec. Commit df505a72899f4d0d9ed30131b030d465b2a748ae removed ruby1.8.rb but it was still included in the gemspec which caused Bundler to complain about an invalid Gemspec. *NOTE* There are five test failures when running 'rake'. I checked out the last commit before Tom's change (d3594f6652384e5eadfe1378e81eb780b1cd0550) and that also has these five failures so I'm happy that we didn't introduce them. --- gollum.gemspec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gollum.gemspec b/gollum.gemspec index 6a1f5cd4..9ff2b69b 100644 --- a/gollum.gemspec +++ b/gollum.gemspec @@ -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