Add latest changes from gitlab-org/gitlab@13-1-stable-ee

1 files changed, 41 insertions, 0 deletions

diff --git a/app/views/shared/wikis/history.html.haml b/app/views/shared/wikis/history.html.haml
new file mode 100644
index 00000000000..ec07082bd02
--- /dev/null
+++ b/app/views/shared/wikis/history.html.haml
@@ -0,0 +1,41 @@
+- page_title _("History"), @page.human_title, _("Wiki")
+
+.wiki-page-header.top-area.has-sidebar-toggle.flex-column.flex-lg-row
+  %button.btn.btn-default.sidebar-toggle.js-sidebar-wiki-toggle{ role: "button", type: "button" }
+    = icon('angle-double-left')
+
+  .nav-text
+    %h2.wiki-page-title
+      = link_to @page.human_title, wiki_page_path(@wiki, @page)
+      %span.light
+        ·
+        = _("History")
+
+.table-holder
+  %table.table
+    %thead
+      %tr
+        %th= s_("Wiki|Page version")
+        %th= _("Author")
+        %th= _("Commit Message")
+        %th= _("Last updated")
+        %th= _("Format")
+    %tbody
+      - @page_versions.each_with_index do |version, index|
+        - commit = version
+        %tr
+          %td
+            = link_to wiki_page_path(@wiki, @page, version_id: index == 0 ? nil : commit.id) do
+              = truncate_sha(commit.id)
+          %td
+            = commit.author_name
+          %td
+            = commit.message
+          %td
+            #{time_ago_with_tooltip(version.authored_date)}
+          %td
+            %strong
+              = version.format
+= paginate @page_versions, theme: 'gitlab'
+
+= render 'shared/wikis/sidebar'