1 files changed, 18 insertions, 9 deletions
diff --git a/app/helpers/commits_helper.rb b/app/helpers/commits_helper.rb
index ee86553d75d..42871dcc56f 100644
--- a/app/helpers/commits_helper.rb
+++ b/app/helpers/commits_helper.rb
@@ -111,7 +111,7 @@ module CommitsHelper
       tooltip = _("Browse Directory")
     end
 
-    link_to url, class: "btn gl-button btn-default btn-icon has-tooltip", title: tooltip, data: { container: "body" } do
+    render Pajamas::ButtonComponent.new(href: url, button_options: { title: tooltip, class: 'has-tooltip btn-icon', data: { container: 'body' } }) do
       sprite_icon('folder-open')
     end
   end
@@ -143,6 +143,16 @@ module CommitsHelper
     end
   end
 
+  def local_committed_date(commit, user)
+    server_timezone = Time.zone
+    user_timezone = user.timezone if user
+    user_timezone = ActiveSupport::TimeZone.new(user_timezone) if user_timezone
+
+    timezone = user_timezone || server_timezone
+
+    commit.committed_date.in_time_zone(timezone).to_date
+  end
+
   def cherry_pick_projects_data(project)
     [project, project.forked_from_project].compact.map do |project|
       {
@@ -188,12 +198,11 @@ module CommitsHelper
     entity = mode == 'raw' ? 'rawButton' : 'renderedButton'
     title = "Display #{mode} diff"
 
-    link_to(
-      "##{mode}-diff-#{file_hash}",
-      class: "btn gl-button btn-default btn-file-option has-tooltip btn-show-#{mode}-diff",
-      title: title,
-      data: { file_hash: file_hash, diff_toggle_entity: entity }
-    ) do
+    render Pajamas::ButtonComponent.new(
+      href: "##{mode}-diff-#{file_hash}",
+      button_options: { title: title,
+                        class: "btn-file-option has-tooltip btn-show-#{mode}-diff",
+                        data: { file_hash: file_hash, diff_toggle_entity: entity } }) do
       sprite_icon(icon)
     end
   end
@@ -242,7 +251,7 @@ module CommitsHelper
     path = project_blob_path(project, tree_join(commit_sha, diff_new_path))
     title = replaced ? _('View replaced file @ ') : _('View file @ ')
 
-    link_to(path, class: 'btn gl-button btn-default gl-ml-3') do
+    render Pajamas::ButtonComponent.new(href: path, button_options: { class: 'gl-ml-3' }) do
       raw(title) + content_tag(:span, truncate_sha(commit_sha), class: 'commit-sha')
     end
   end
@@ -253,7 +262,7 @@ module CommitsHelper
     external_url = environment.external_url_for(diff_new_path, commit_sha)
     return unless external_url
 
-    link_to(external_url, class: 'btn gl-button btn-default btn-file-option has-tooltip', target: '_blank', rel: 'noopener noreferrer', title: "View on #{environment.formatted_external_url}", data: { container: 'body' }) do
+    render Pajamas::ButtonComponent.new(href: external_url, target: '_blank', button_options: { rel: 'noopener noreferrer', title: "View on #{environment.formatted_external_url}", data: { container: 'body' } }) do
       sprite_icon('external-link')
     end
   end