Permalink
Browse files

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

…-bugfixes
  • Loading branch information...
2 parents e0494a6 + e4d63ec commit 9a96d7609919f4ff83cae4d71760ee8ee2feeff3 @technoweenie technoweenie committed Mar 31, 2011
Showing with 2 additions and 4 deletions.
  1. +1 −3 lib/gollum/frontend/templates/edit.mustache
  2. +1 −1 lib/gollum/wiki.rb
@@ -8,9 +8,7 @@
class="action-page-history">Page History</a></li>
</ul>
</div>
-<div id="wiki-content">
- {{>editor}}
-</div>
+ <div id="wiki-content">{{>editor}}</div>
</div>
<script type="text/javascript">
jQuery(document).ready(function() {
View
@@ -407,7 +407,7 @@ def size(ref = nil)
#
# Returns an Array with Objects of page name and count of matches
def search(query)
- args = [{:c => query}, 'master', '--']
+ args = [{}, '-i', '-c', query, 'master', '--']
args << '--' << @page_file_dir if @page_file_dir
@repo.git.grep(*args).split("\n").map! do |line|

0 comments on commit 9a96d76

Please sign in to comment.