summaryrefslogtreecommitdiff
path: root/app/models/project_wiki.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-09-25 13:58:20 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-09-25 13:58:20 +0000
commit3a72af480d5a89a0cf5fd27e65e473c49e63eaad (patch)
tree283ce8045df34394b32a674ad4f82123669d2b1d /app/models/project_wiki.rb
parent9cd5ff043a72001201b4c8192a45f8029ebe84ac (diff)
parenteaeb4a90d431ff5e1e6156c10f3118f70c3c4f8e (diff)
downloadgitlab-ce-3a72af480d5a89a0cf5fd27e65e473c49e63eaad.tar.gz
Merge branch 'use-more-rugged' into 'master'
Make GitLab CE works with new gitlab_git Recently we removed grit dependency from `gitlab_git` in favor of rugged. This changes make GitLab works with new library. See merge request !194
Diffstat (limited to 'app/models/project_wiki.rb')
-rw-r--r--app/models/project_wiki.rb12
1 files changed, 12 insertions, 0 deletions
diff --git a/app/models/project_wiki.rb b/app/models/project_wiki.rb
index a82a300a672..770a26ed894 100644
--- a/app/models/project_wiki.rb
+++ b/app/models/project_wiki.rb
@@ -107,6 +107,18 @@ class ProjectWiki
[title.gsub(/\.[^.]*$/, ""), title_array.join("/")]
end
+ def search_files(query)
+ repository.search_files(query, default_branch)
+ end
+
+ def repository
+ Repository.new(path_with_namespace, default_branch)
+ end
+
+ def default_branch
+ wiki.class.default_ref
+ end
+
private
def create_repo!