gollum 2.3.5 → 2.3.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/gollum.gemspec +2 -2
- data/lib/gollum.rb +1 -1
- data/lib/gollum/frontend/app.rb +2 -1
- metadata +2 -2
data/gollum.gemspec
CHANGED
|
@@ -5,8 +5,8 @@ Gem::Specification.new do |s|
|
|
|
5
5
|
s.required_ruby_version = ">= 1.8.7"
|
|
6
6
|
|
|
7
7
|
s.name = 'gollum'
|
|
8
|
-
s.version = '2.3.
|
|
9
|
-
s.date = '2012-
|
|
8
|
+
s.version = '2.3.6'
|
|
9
|
+
s.date = '2012-11-05'
|
|
10
10
|
s.rubyforge_project = 'gollum'
|
|
11
11
|
|
|
12
12
|
s.summary = "A simple, Git-powered wiki."
|
data/lib/gollum.rb
CHANGED
|
@@ -23,7 +23,7 @@ require File.expand_path('../gollum/web_sequence_diagram', __FILE__)
|
|
|
23
23
|
require File.expand_path('../gollum/frontend/uri_encode_component', __FILE__)
|
|
24
24
|
|
|
25
25
|
module Gollum
|
|
26
|
-
VERSION = '2.3.
|
|
26
|
+
VERSION = '2.3.6'
|
|
27
27
|
|
|
28
28
|
def self.assets_path
|
|
29
29
|
::File.expand_path('gollum/frontend/public', ::File.dirname(__FILE__))
|
data/lib/gollum/frontend/app.rb
CHANGED
|
@@ -306,7 +306,8 @@ module Precious
|
|
|
306
306
|
get '/search' do
|
|
307
307
|
@query = params[:q]
|
|
308
308
|
wiki = wiki_new
|
|
309
|
-
|
|
309
|
+
# Sort wiki search results by count (desc) and then by name (asc)
|
|
310
|
+
@results = wiki.search(@query).sort{ |a, b| (a[:count] <=> b[:count]).nonzero? || b[:name] <=> a[:name] }.reverse
|
|
310
311
|
@name = @query
|
|
311
312
|
mustache :search
|
|
312
313
|
end
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: gollum
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.3.
|
|
4
|
+
version: 2.3.6
|
|
5
5
|
prerelease:
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
@@ -10,7 +10,7 @@ authors:
|
|
|
10
10
|
autorequire:
|
|
11
11
|
bindir: bin
|
|
12
12
|
cert_chain: []
|
|
13
|
-
date: 2012-
|
|
13
|
+
date: 2012-11-05 00:00:00.000000000 Z
|
|
14
14
|
dependencies:
|
|
15
15
|
- !ruby/object:Gem::Dependency
|
|
16
16
|
name: grit
|