Merge branch 'timeago_js' of /home/git/repositories/gitlab/gitlabhq

app/assets/javascripts/main.js.coffee

@@ -81,6 +81,7 @@ $ ->
     $(@).parents('form').submit()
 
   $("abbr.timeago").timeago()
+  $('.js-timeago').timeago()
 
   # Flash
   if (flash = $(".flash-container")).length > 0

app/helpers/application_helper.rb

@@ -72,7 +72,7 @@ module ApplicationHelper
 
   def last_commit(project)
     if project.repo_exists?
-      time_ago_with_tooltip(project.repository.commit.committed_date) + " ago"
+      time_ago_with_tooltip(project.repository.commit.committed_date)
     else
       "Never"
     end
@@ -210,11 +210,11 @@ module ApplicationHelper
 
   def time_ago_with_tooltip(date, placement = 'top', html_class = 'time_ago')
     capture_haml do
-      haml_tag :time, time_ago_in_words(date),
-        class: html_class, datetime: date, title: date.stamp("Aug 21, 2011 9:23pm"),
+      haml_tag :time, date.to_s,
+        class: html_class, datetime: date.getutc.iso8601, title: date.stamp("Aug 21, 2011 9:23pm"),
         data: { toggle: 'tooltip', placement: placement }
 
-      haml_tag :script, "$('." + html_class + "').tooltip()"
+      haml_tag :script, "$('." + html_class + "').timeago().tooltip()"
     end.html_safe
   end
 end

app/helpers/notes_helper.rb

@@ -23,11 +23,11 @@ module NotesHelper
 
   def note_timestamp(note)
     # Shows the created at time and the updated at time if different
-    ts = "#{time_ago_with_tooltip(note.created_at, 'bottom', 'note_created_ago')} ago"
+    ts = "#{time_ago_with_tooltip(note.created_at, 'bottom', 'note_created_ago')}"
     if note.updated_at != note.created_at
       ts << capture_haml do
         haml_tag :small do
-          haml_concat " (Edited #{time_ago_with_tooltip(note.updated_at, 'bottom', 'note_edited_ago')} ago)"
+          haml_concat " (Edited #{time_ago_with_tooltip(note.updated_at, 'bottom', 'note_edited_ago')})"
         end
       end
     end

app/helpers/projects_helper.rb

@@ -190,7 +190,7 @@ module ProjectsHelper
 
   def project_last_activity(project)
     if project.last_activity_at
-      time_ago_with_tooltip(project.last_activity_at, 'bottom', 'last_activity_time_ago') + " ago"
+      time_ago_with_tooltip(project.last_activity_at, 'bottom', 'last_activity_time_ago')
     else
       "Never"
     end

app/views/admin/dashboard/index.html.haml

@@ -37,7 +37,7 @@
       %p
         = link_to project.name_with_namespace, [:admin, project]
         %span.light.pull-right
-          #{time_ago_with_tooltip(project.created_at)} ago
+          #{time_ago_with_tooltip(project.created_at)}
 
   .span4
     %h4 Latest users
@@ -47,7 +47,7 @@
         = link_to [:admin, user] do
           = user.name
         %span.light.pull-right
-          #{time_ago_with_tooltip(user.created_at)} ago
+          #{time_ago_with_tooltip(user.created_at)}
 
   .span4
     %h4 Latest groups
@@ -57,7 +57,7 @@
         = link_to [:admin, group] do
           = group.name
         %span.light.pull-right
-          #{time_ago_with_tooltip(group.created_at)} ago
+          #{time_ago_with_tooltip(group.created_at)}
 
 %br
 .row

app/views/events/_event.html.haml

 - if event.proper?
   .event-item{class: "#{event.body? ? "event-block" : "event-inline" }"}
     %span.cgray.pull-right
-      #{time_ago_with_tooltip(event.created_at)} ago
+      #{time_ago_with_tooltip(event.created_at)}
 
     = cache event do
       = image_tag avatar_icon(event.author_email, 24), class: "avatar s24", alt:''

app/views/events/_event_last_push.html.haml

@@ -5,7 +5,7 @@
       %strong= truncate(event.ref_name, length: 28)
     at
     %strong= link_to_project event.project
-    #{time_ago_with_tooltip(event.created_at)} ago
+    #{time_ago_with_tooltip(event.created_at)}
 
     .pull-right
       = link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn btn-create btn-small" do

app/views/profiles/keys/_key.html.haml

@@ -4,6 +4,6 @@
   %span
     (#{key.fingerprint})
   %span.cgray
-    added #{time_ago_with_tooltip(key.created_at)} ago
+    added #{time_ago_with_tooltip(key.created_at)}
 
   = link_to 'Remove', profile_key_path(key), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn btn-small btn-remove delete-key pull-right"

app/views/projects/branches/_branch.html.haml

@@ -27,4 +27,4 @@
     = image_tag avatar_icon(commit.author_email), class: "avatar s16", alt: ''
     %span.light
       = gfm escape_once(truncate(commit.title, length: 40))
-    #{time_ago_with_tooltip(commit.committed_date)} ago
+    #{time_ago_with_tooltip(commit.committed_date)}

app/views/projects/commit/_commit_box.html.haml

@@ -23,14 +23,14 @@
   %span.light Authored by
   %strong
     = commit_author_link(@commit, avatar: true, size: 24)
-  #{time_ago_with_tooltip(@commit.authored_date)} ago
+  #{time_ago_with_tooltip(@commit.authored_date)}
 
 - if @commit.different_committer?
   .commit-info-row
     %span.light Committed by
     %strong
       = commit_committer_link(@commit, avatar: true, size: 24)
-    #{time_ago_with_tooltip(@commit.committed_date)} ago
+    #{time_ago_with_tooltip(@commit.committed_date)}
 
 .commit-info-row
   %span.cgray= pluralize(@commit.parents.count, "parent")

app/views/projects/commits/_commit.html.haml

@@ -14,4 +14,4 @@
   .commit-row-info
     = commit_author_link(commit, avatar: true, size: 16)
     .committed_ago
-      #{time_ago_with_tooltip(commit.committed_date)} ago  
+      #{time_ago_with_tooltip(commit.committed_date)}  

app/views/projects/commits/_inline_commit.html.haml

@@ -3,4 +3,4 @@
     = link_to commit.short_id(8), project_commit_path(project, commit), class: "commit_short_id"
      
     = link_to_gfm truncate(commit.title, length: 40), project_commit_path(project, commit.id), class: "commit-row-message"
-    #{time_ago_with_tooltip(commit.committed_date)} ago  
+    #{time_ago_with_tooltip(commit.committed_date)}  

app/views/projects/deploy_keys/_deploy_key.html.haml

@@ -21,4 +21,4 @@
     - deploy_key.projects.map(&:name_with_namespace).each do |project_name|
       %span.label.label-gray.deploy-project-label= project_name
     %small.pull-right
-      Created #{time_ago_with_tooltip(deploy_key.created_at)} ago
+      Created #{time_ago_with_tooltip(deploy_key.created_at)}

app/views/projects/issues/_issue.html.haml

@@ -26,7 +26,7 @@
         %i.icon-time
         = issue.milestone.title
     .pull-right
-      %small updated #{time_ago_with_tooltip(issue.updated_at, 'bottom', 'issue_update_ago')} ago
+      %small updated #{time_ago_with_tooltip(issue.updated_at, 'bottom', 'issue_update_ago')}
 
     .issue-labels
       - issue.labels.each do |label|

app/views/projects/issues/show.html.haml

@@ -2,7 +2,7 @@
   Issue ##{@issue.iid}
 
   %small
-    created #{time_ago_with_tooltip(@issue.created_at)} ago
+    created #{time_ago_with_tooltip(@issue.created_at)}
 
   - if @issue.closed?
     %span.state-label.state-label-red Closed

app/views/projects/merge_requests/_merge_request.html.haml

@@ -34,4 +34,4 @@
 
 
     .pull-right
-      %small updated #{time_ago_with_tooltip(merge_request.updated_at, 'bottom', 'merge_request_updated_ago')} ago
+      %small updated #{time_ago_with_tooltip(merge_request.updated_at, 'bottom', 'merge_request_updated_ago')}

app/views/projects/merge_requests/show/_mr_box.html.haml

@@ -25,13 +25,13 @@
       %span
         %i.icon-remove
         Closed by #{link_to_member(@project, @merge_request.closed_event.author)}
-        #{time_ago_with_tooltip(@merge_request.closed_event.created_at)} ago.
+        #{time_ago_with_tooltip(@merge_request.closed_event.created_at)}.
   - if @merge_request.merged?
     .description.alert-success
       %span
         %i.icon-ok
         Merged by #{link_to_member(@project, @merge_request.merge_event.author)}
-        #{time_ago_with_tooltip(@merge_request.merge_event.created_at)} ago.
+        #{time_ago_with_tooltip(@merge_request.merge_event.created_at)}.
   - if !@closes_issues.empty? && @merge_request.opened?
     .description.alert-info
       %span

app/views/projects/merge_requests/show/_mr_title.html.haml

 %h3.page-title
   = "Merge Request ##{@merge_request.iid}"
   %small
-    created #{time_ago_with_tooltip(@merge_request.created_at)} ago
+    created #{time_ago_with_tooltip(@merge_request.created_at)}
 
   - if @merge_request.merged?
     %span.state-label.state-label-green

app/views/projects/notes/_discussion.html.haml

@@ -32,7 +32,7 @@
       last updated by
       = link_to_member(@project, last_note.author, avatar: false)
       %span.discussion-last-update
-        #{time_ago_with_tooltip(last_note.updated_at, 'bottom', 'discussion_updated_ago')} ago
+        #{time_ago_with_tooltip(last_note.updated_at, 'bottom', 'discussion_updated_ago')}
   .discussion-body
     - if note.for_diff_line?
       - if note.active?

app/views/projects/protected_branches/index.html.haml

@@ -46,6 +46,6 @@
                 = commit.short_id
               %span.light
                 = gfm escape_once(truncate(commit.title, length: 40))
-              #{time_ago_with_tooltip(commit.committed_date)} ago
+              #{time_ago_with_tooltip(commit.committed_date)}
             - else
               (branch was removed from repository)

app/views/projects/refs/logs_tree.js.haml

@@ -5,5 +5,5 @@
 
   :plain
     var row = $("table.table_#{@hex_path} tr.file_#{hexdigest(file_name)}");
-    row.find("td.tree_time_ago").html('#{escape_javascript time_ago_with_tooltip(commit.committed_date)} ago');
+    row.find("td.tree_time_ago").html('#{escape_javascript time_ago_with_tooltip(commit.committed_date)}');
     row.find("td.tree_commit").html('#{escape_javascript render("projects/tree/tree_commit_column", commit: commit)}');

app/views/projects/repositories/_feed.html.haml

@@ -15,5 +15,4 @@
       = gfm escape_once(truncate(commit.title, length: 40))
   %td
     %span.pull-right.cgray
-      = time_ago_in_words(commit.committed_date)
-      ago
+      = time_ago_with_tooltip(commit.committed_date)

app/views/projects/snippets/_snippet.html.haml

@@ -19,4 +19,4 @@
       = image_tag avatar_icon(snippet.author_email), class: "avatar avatar-inline s16"
       = snippet.author_name
       %span.light
-        #{time_ago_with_tooltip(snippet.created_at)} ago
+        #{time_ago_with_tooltip(snippet.created_at)}

app/views/projects/tags/index.html.haml

@@ -24,7 +24,7 @@
           .pull-right
             %small.cdark
               %i.icon-calendar
-              #{time_ago_with_tooltip(commit.committed_date)} ago
+              #{time_ago_with_tooltip(commit.committed_date)}
         %p.prepend-left-20
           = link_to commit.short_id(8), project_commit_path(@project, commit), class: "monospace"
           –

app/views/projects/wikis/history.html.haml

@@ -23,7 +23,7 @@
         %td
           = commit.title
         %td
-          #{time_ago_with_tooltip(version.date)} ago
+          #{time_ago_with_tooltip(version.date)}
         %td
           %strong
             = @wiki.page.wiki.page(@wiki.page.name, commit.id).try(:format)

app/views/projects/wikis/pages.html.haml

@@ -8,4 +8,4 @@
         = link_to wiki_page.title.titleize, project_wiki_path(@project, wiki_page)
         %small (#{wiki_page.format})
         .pull-right
-          %small Last edited #{time_ago_with_tooltip(wiki_page.commit.created_at)} ago
+          %small Last edited #{time_ago_with_tooltip(wiki_page.commit.created_at)}

app/views/projects/wikis/show.html.haml

@@ -17,4 +17,4 @@
 %hr
 
 .wiki-last-edit-by
-  Last edited by #{commit_author_link(@wiki.commit, avatar: true, size: 16)} #{time_ago_with_tooltip(@wiki.commit.created_at)} ago
+  Last edited by #{commit_author_link(@wiki.commit, avatar: true, size: 16)} #{time_ago_with_tooltip(@wiki.commit.created_at)}

app/views/snippets/_snippet.html.haml

@@ -20,4 +20,4 @@
       = link_to user_snippets_path(snippet.author) do
         = image_tag avatar_icon(snippet.author_email), class: "avatar avatar-inline s16", alt: ''
         = snippet.author_name
-      %span.light #{time_ago_with_tooltip(snippet.created_at)} ago
+      %span.light #{time_ago_with_tooltip(snippet.created_at)}