wiki.ohea.xyz/gollum
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch 'bugfixes' of https://github.com/philc/gollum into philc-bugfixes

Browse Source
This commit is contained in:
rick
2011-03-31 14:35:54 -07:00
parent e0494a6321 e4d63ec8a2
commit 9a96d76099
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/gollum/frontend/templates/edit.mustache
+1 -3
View File
@@ -8,9 +8,7 @@
class="action-page-history">Page History</a></li> class="action-page-history">Page History</a></li>
</ul> </ul>
</div> </div>
<div id="wiki-content"> <div id="wiki-content">{{>editor}}</div>
{{>editor}}
</div>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
jQuery(document).ready(function() { jQuery(document).ready(function() {
lib/gollum/wiki.rb
+1 -1
View File
@@ -407,7 +407,7 @@ module Gollum
# #
# Returns an Array with Objects of page name and count of matches # Returns an Array with Objects of page name and count of matches
def search(query) def search(query)
args = [{:c => query}, 'master', '--'] args = [{}, '-i', '-c', query, 'master', '--']
args << '--' << @page_file_dir if @page_file_dir args << '--' << @page_file_dir if @page_file_dir
@repo.git.grep(*args).split("\n").map! do |line| @repo.git.grep(*args).split("\n").map! do |line|