From 4b65b0e0f5804492e90c3ee8037739c47bcc354b Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 25 Sep 2014 13:56:23 +0300
Subject: Fix wiki

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 app/models/project_wiki.rb                 | 12 ++++++++++++
 app/models/wiki_page.rb                    |  4 ++--
 app/views/projects/wikis/history.html.haml |  6 +++---
 app/views/projects/wikis/pages.html.haml   |  2 +-
 app/views/projects/wikis/show.html.haml    |  2 +-
 app/views/shared/_file_hljs.html.haml      | 13 +++++++------
 6 files changed, 26 insertions(+), 13 deletions(-)

(limited to 'app')

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!
diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb
index b8a0a9eb58b..b9ab6702c53 100644
--- a/app/models/wiki_page.rb
+++ b/app/models/wiki_page.rb
@@ -87,14 +87,14 @@ class WikiPage
   def version
     return nil unless persisted?
 
-    @version ||= Commit.new(Gitlab::Git::Commit.new(@page.version))
+    @version ||= @page.version
   end
 
   # Returns an array of Gitlab Commit instances.
   def versions
     return [] unless persisted?
 
-    @page.versions.map { |v| Commit.new(Gitlab::Git::Commit.new(v)) }
+    @page.versions
   end
 
   def commit
diff --git a/app/views/projects/wikis/history.html.haml b/app/views/projects/wikis/history.html.haml
index 7bc566cf7f5..d3a66c48c9b 100644
--- a/app/views/projects/wikis/history.html.haml
+++ b/app/views/projects/wikis/history.html.haml
@@ -17,11 +17,11 @@
       %tr
         %td
           = link_to project_wiki_path(@project, @page, version_id: commit.id) do
-            = commit.short_id
+            = commit.id[0..10]
         %td
-          = commit_author_link(commit, avatar: true, size: 24)
+          = commit.author.name
         %td
-          = commit.title
+          = commit.message
         %td
           #{time_ago_with_tooltip(version.date)}
         %td
diff --git a/app/views/projects/wikis/pages.html.haml b/app/views/projects/wikis/pages.html.haml
index 74317faf9d6..264b48ec36c 100644
--- a/app/views/projects/wikis/pages.html.haml
+++ b/app/views/projects/wikis/pages.html.haml
@@ -8,5 +8,5 @@
         = link_to wiki_page.title, project_wiki_path(@project, wiki_page)
         %small (#{wiki_page.format})
         .pull-right
-          %small Last edited #{time_ago_with_tooltip(wiki_page.commit.created_at)}
+          %small Last edited #{time_ago_with_tooltip(wiki_page.commit.authored_date)}
 = paginate @wiki_pages, theme: 'gitlab'
diff --git a/app/views/projects/wikis/show.html.haml b/app/views/projects/wikis/show.html.haml
index cb923e4ca32..ede4fef9e24 100644
--- a/app/views/projects/wikis/show.html.haml
+++ b/app/views/projects/wikis/show.html.haml
@@ -17,4 +17,4 @@
 %hr
 
 .wiki-last-edit-by
-  Last edited by #{commit_author_link(@page.commit, avatar: true, size: 16)} #{time_ago_with_tooltip(@page.commit.created_at)}
+  Last edited by #{@page.commit.author.name} #{time_ago_with_tooltip(@page.commit.authored_date)}
diff --git a/app/views/shared/_file_hljs.html.haml b/app/views/shared/_file_hljs.html.haml
index 7dd97c2b25c..cbc01bd60e0 100644
--- a/app/views/shared/_file_hljs.html.haml
+++ b/app/views/shared/_file_hljs.html.haml
@@ -1,11 +1,12 @@
 %div.highlighted-data{class: user_color_scheme_class}
   .line-numbers
-    - blob.data.lines.to_a.size.times do |index|
-      - offset = defined?(first_line_number) ? first_line_number : 1
-      - i = index + offset
-      = link_to "#L#{i}", id: "L#{i}", rel: "#L#{i}" do
-        %i.icon-link
-        = i
+    - if blob.data.present?
+      - blob.data.lines.to_a.size.times do |index|
+        - offset = defined?(first_line_number) ? first_line_number : 1
+        - i = index + offset
+        = link_to "#L#{i}", id: "L#{i}", rel: "#L#{i}" do
+          %i.icon-link
+          = i
   .highlight
     %pre
       %code{ class: highlightjs_class(blob.name) }
-- 
cgit v1.2.1