From 7a0d4919b0da916e0feb37b0332cf835a9abf212 Mon Sep 17 00:00:00 2001
From: zorun <zorun.42@gmail.com>
Date: Fri, 22 Nov 2013 12:49:42 +0100
Subject: [PATCH 1/8] Prevent indexing of old versions of a page (fixes #768)

---
 lib/gollum/app.rb                    | 1 +
 lib/gollum/templates/layout.mustache | 1 +
 lib/gollum/views/page.rb             | 4 ++++
 3 files changed, 6 insertions(+)

diff --git a/lib/gollum/app.rb b/lib/gollum/app.rb
index e16ee7c7..da390050 100644
--- a/lib/gollum/app.rb
+++ b/lib/gollum/app.rb
@@ -386,6 +386,7 @@ module Precious
         @page = page
         @name = name
         @content = page.formatted_data
+        @version = version
         mustache :page
       else
         halt 404
diff --git a/lib/gollum/templates/layout.mustache b/lib/gollum/templates/layout.mustache
index 1012691c..e49046c0 100644
--- a/lib/gollum/templates/layout.mustache
+++ b/lib/gollum/templates/layout.mustache
@@ -7,6 +7,7 @@
   <link rel="stylesheet" type="text/css" href="{{base_url}}/css/dialog.css" media="all">
   <link rel="stylesheet" type="text/css" href="{{base_url}}/css/template.css" media="all">
   {{#css}}<link rel="stylesheet" type="text/css" href="{{base_url}}/custom.css" media="all">{{/css}}
+  {{#noindex}}<meta name="robots" content="noindex, nofollow" />{{/noindex}}
 
   <!--[if IE 7]>
   <link rel="stylesheet" type="text/css" href="{{base_url}}/css/ie7.css" media="all">
diff --git a/lib/gollum/views/page.rb b/lib/gollum/views/page.rb
index 04165649..a556f472 100644
--- a/lib/gollum/views/page.rb
+++ b/lib/gollum/views/page.rb
@@ -35,6 +35,10 @@ module Precious
         first.authored_date.strftime(DATE_FORMAT)
       end
 
+      def noindex
+        @version ? true : false
+      end
+
       def editable
         @editable
       end

From 5abc98317232a0fbcbddd4bfee901e85168ee6f3 Mon Sep 17 00:00:00 2001
From: Evgeni Cherdancev <cyber@sibnet.ru>
Date: Thu, 28 Nov 2013 12:26:06 +0700
Subject: [PATCH 2/8] write_page first slash fix

---
 lib/gollum/app.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/gollum/app.rb b/lib/gollum/app.rb
index e16ee7c7..c4db2765 100644
--- a/lib/gollum/app.rb
+++ b/lib/gollum/app.rb
@@ -290,6 +290,7 @@ module Precious
       wiki = wiki_new
 
       begin
+        path.gsub!(/^\//, '')
         wiki.write_page(name, format, params[:content], commit_message, path)
 
         page_dir = settings.wiki_options[:page_file_dir].to_s

From 1c498ead35639ee22c2ec16bbe49ade073a743ae Mon Sep 17 00:00:00 2001
From: Evgeni Cherdancev <cyber@sibnet.ru>
Date: Thu, 28 Nov 2013 12:32:08 +0700
Subject: [PATCH 3/8] gsub before begin

---
 lib/gollum/app.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/gollum/app.rb b/lib/gollum/app.rb
index c4db2765..450d2784 100644
--- a/lib/gollum/app.rb
+++ b/lib/gollum/app.rb
@@ -289,8 +289,9 @@ module Precious
       format       = params[:format].intern
       wiki = wiki_new
 
+      path.gsub!(/^\//, '')
+
       begin
-        path.gsub!(/^\//, '')
         wiki.write_page(name, format, params[:content], commit_message, path)
 
         page_dir = settings.wiki_options[:page_file_dir].to_s

From 94fa985550cd6922a56898a3097b61b4fefd512b Mon Sep 17 00:00:00 2001
From: zorun <zorun.42@gmail.com>
Date: Fri, 6 Dec 2013 02:46:15 +0100
Subject: [PATCH 4/8] Add a test for issue #772

---
 test/test_app.rb | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/test/test_app.rb b/test/test_app.rb
index e7056bfd..2e2de80c 100644
--- a/test/test_app.rb
+++ b/test/test_app.rb
@@ -523,6 +523,18 @@ context "Frontend" do
     assert_match /スイカ/, last_response.body
   end
 
+  test "add noindex tags to history pages" do
+    get "A"
+
+    assert last_response.ok?
+    assert_no_match /meta name="robots" content="noindex, nofollow"/, last_response.body
+
+    get "A/fc66539528eb96f21b2bbdbf557788fe8a1196ac"
+
+    assert last_response.ok?
+    assert_match /meta name="robots" content="noindex, nofollow"/, last_response.body
+  end
+
   def app
     Precious::App
   end

From 9f3766952f9d0cb68490bb3a3b30829b606dddc5 Mon Sep 17 00:00:00 2001
From: Matt Palmer <mpalmer@hezmatt.org>
Date: Tue, 31 Dec 2013 15:18:15 +1100
Subject: [PATCH 5/8] Fix version specifiers

Adjusted the version specs on the two gems that explicitly state they are
SemVer compliant, and fixed up the one dependency that correctly *could* have
used ~> but didn't.
---
 gollum.gemspec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gollum.gemspec b/gollum.gemspec
index bb9241ee..7228b4a3 100644
--- a/gollum.gemspec
+++ b/gollum.gemspec
@@ -24,14 +24,14 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.extra_rdoc_files = %w[README.md LICENSE]
 
-  s.add_dependency 'gollum-lib', '~> 1.0.9'
+  s.add_dependency 'gollum-lib', '~> 1.0', '>= 1.0.9'
   s.add_dependency 'github-markdown', '~> 0.5.5'
-  s.add_dependency 'sinatra', '~> 1.4.3'
+  s.add_dependency 'sinatra', '~> 1.4', '>= 1.4.3'
   s.add_dependency 'mustache', ['>= 0.99.4', '< 1.0.0']
   s.add_dependency 'useragent', '~> 0.8.2'
 
   s.add_development_dependency 'rack-test', '~> 0.6.2'
-  s.add_development_dependency 'shoulda', ['>= 3.4.0', '< 3.5.0']
+  s.add_development_dependency 'shoulda', '~> 3.4.0'
   s.add_development_dependency 'minitest-reporters', '~> 0.14.16'
 
   # = MANIFEST =

From b836b0e273d8ded8749e9eb36550f96bd2ff6e5d Mon Sep 17 00:00:00 2001
From: Pete Keen <peter.keen@bugsplat.info>
Date: Wed, 1 Jan 2014 17:05:32 -0500
Subject: [PATCH 6/8] Base upload button action on home page url

---
 lib/gollum/public/gollum/javascript/gollum.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/gollum/public/gollum/javascript/gollum.js b/lib/gollum/public/gollum/javascript/gollum.js
index 7b3fc87c..947b80f0 100755
--- a/lib/gollum/public/gollum/javascript/gollum.js
+++ b/lib/gollum/public/gollum/javascript/gollum.js
@@ -155,7 +155,8 @@ $(document).ready(function() {
         fields: [
           {
             type:   'file',
-            context: 'Your uploaded file will be accessible at /uploads/[filename]'
+            context: 'Your uploaded file will be accessible at /uploads/[filename]',
+            action: $('.action-home-page').first().attr('href') + 'uploadFile'
           }
         ],
         OK: function( res ) {

From d9b38c3b7394a601287c72ea44391b7a4f2fa662 Mon Sep 17 00:00:00 2001
From: bootstraponline <code@bootstraponline.com>
Date: Thu, 2 Jan 2014 23:03:33 -0500
Subject: [PATCH 7/8] Use baseUrl for /uploadFile

Thanks @mpalmer
https://github.com/gollum/gollum/pull/780
---
 lib/gollum/public/gollum/javascript/gollum.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/gollum/public/gollum/javascript/gollum.js b/lib/gollum/public/gollum/javascript/gollum.js
index 947b80f0..f778caec 100755
--- a/lib/gollum/public/gollum/javascript/gollum.js
+++ b/lib/gollum/public/gollum/javascript/gollum.js
@@ -156,7 +156,7 @@ $(document).ready(function() {
           {
             type:   'file',
             context: 'Your uploaded file will be accessible at /uploads/[filename]',
-            action: $('.action-home-page').first().attr('href') + 'uploadFile'
+            action: baseUrl + '/uploadFile'
           }
         ],
         OK: function( res ) {

From 3fd16daeca869f485828b8a59290580f415d3c03 Mon Sep 17 00:00:00 2001
From: bootstraponline <code@bootstraponline.com>
Date: Thu, 2 Jan 2014 23:32:41 -0500
Subject: [PATCH 8/8] Release 2.6.0

---
 gollum.gemspec | 4 ++--
 lib/gollum.rb  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gollum.gemspec b/gollum.gemspec
index 7228b4a3..284337ca 100644
--- a/gollum.gemspec
+++ b/gollum.gemspec
@@ -5,8 +5,8 @@ Gem::Specification.new do |s|
   s.required_ruby_version = ">= 1.9"
 
   s.name              = 'gollum'
-  s.version           = '2.5.2'
-  s.date              = '2013-11-02'
+  s.version           = '2.6.0'
+  s.date              = '2014-01-02'
   s.rubyforge_project = 'gollum'
   s.license           = 'MIT'
 
diff --git a/lib/gollum.rb b/lib/gollum.rb
index 05d072a3..44ecc47a 100644
--- a/lib/gollum.rb
+++ b/lib/gollum.rb
@@ -16,7 +16,7 @@ require File.expand_path('../gollum/uri_encode_component', __FILE__)
 $KCODE = 'U' if RUBY_VERSION[0,3] == '1.8'
 
 module Gollum
-  VERSION = '2.5.2'
+  VERSION = '2.6.0'
 
   def self.assets_path
     ::File.expand_path('gollum/public', ::File.dirname(__FILE__))