Merge branch 'add_issue_edited_timestamp' into 'master'

Add issue edited timestamp Comments already have this feature. So, I think, issues should also have it. ![Снимок экрана 2014-11-08 в 17.07.10](https://gitlab.com/uploads/vernik91/gitlab-ce/4e87a15130/%D0%A1%D0%BD%D0%B8%D0%BC%D0%BE%D0%BA_%D1%8D%D0%BA%D1%80%D0%B0%D0%BD%D0%B0_2014-11-08_%D0%B2_17.07.10.png) See merge request !235

Merge branch 'add_issue_edited_timestamp' into 'master'
c58edd7c · Dmitriy Zaporozhets · 95e8f979 · 2148e199 · c58edd7c · c58edd7c
Commit c58edd7c authored Nov 12, 2014 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 1 deletion

issues_helper.rb app/helpers/issues_helper.rb +13 -0

show.html.haml app/views/projects/issues/show.html.haml +1 -1

No files found.
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -62,6 +62,19 @@ module IssuesHelper
    ''
  end

+  def issue_timestamp(issue)
+    # Shows the created at time and the updated at time if different
+    ts = "#{time_ago_with_tooltip(issue.created_at, 'bottom', 'note_created_ago')}"
+    if issue.updated_at != issue.created_at
+      ts << capture_haml do
+        haml_tag :small do
+          haml_concat " (Edited #{time_ago_with_tooltip(issue.updated_at, 'bottom', 'issue_edited_ago')})"
+        end
+      end
+    end
+    ts.html_safe
+  end
+
  # Checks if issues_tracker setting exists in gitlab.yml
  def external_issues_tracker_enabled?
    Gitlab.config.issues_tracker && Gitlab.config.issues_tracker.values.any?

--- a/app/views/projects/issues/show.html.haml
+++ b/app/views/projects/issues/show.html.haml
@@ -39,7 +39,7 @@
        Open

    .creator
-      Created by #{link_to_member(@project, @issue.author)} #{time_ago_with_tooltip(@issue.created_at)}
+      Created by #{link_to_member(@project, @issue.author)} #{issue_timestamp(@issue)}

  %h4.title
    = gfm escape_once(@issue.title)