From 117058216978cb419e129088a2f7253a63b8aabd Mon Sep 17 00:00:00 2001
From: Alexander Malfait <alex@catsolutions.be>
Date: Thu, 27 Aug 2020 12:12:43 +0200
Subject: [PATCH] Add created_at and updated_at to merge requests, fix layout
 in Redmine 4.1

---
 .../merge_request_links/_merge_request_link.html.erb     | 6 ++----
 assets/stylesheets/redmine_merge_request_links.css       | 9 +--------
 .../20200827093954_add_timestamps_to_merge_request.rb    | 7 +++++++
 lib/redmine_merge_request_links/hooks.rb                 | 3 +--
 4 files changed, 11 insertions(+), 14 deletions(-)
 create mode 100644 db/migrate/20200827093954_add_timestamps_to_merge_request.rb

diff --git a/app/views/merge_request_links/_merge_request_link.html.erb b/app/views/merge_request_links/_merge_request_link.html.erb
index 276dcde..4b55071 100644
--- a/app/views/merge_request_links/_merge_request_link.html.erb
+++ b/app/views/merge_request_links/_merge_request_link.html.erb
@@ -7,9 +7,7 @@
                   class: 'merge-request-id') %>
   <%= link_to(merge_request.title, merge_request.url) %>
   <span class="merge-request-by-line">
-    <%= l(:mrl_label_by) %>
-    <%= content_tag(:span,
-                    merge_request.author_name,
-                    class: 'merge-request-author') %>
+     <%= l(:label_added_time_by, author: merge_request.author_name, age: time_tag(merge_request.created_at)).html_safe %>,
+     <%= l(:label_updated_time, time_tag(merge_request.updated_at)).html_safe %>
   </span>
 <% end %>
diff --git a/assets/stylesheets/redmine_merge_request_links.css b/assets/stylesheets/redmine_merge_request_links.css
index 179826b..28f7f94 100644
--- a/assets/stylesheets/redmine_merge_request_links.css
+++ b/assets/stylesheets/redmine_merge_request_links.css
@@ -3,10 +3,7 @@ div#issue-changesets {
 }
 
 div#issue-merge-requests {
-  float: right;
-  width: 45%;
-  margin: 1em 0 2em 1em;
-  padding-left: 1em;
+  margin: 1em 0;
 }
 
 @media screen and (max-width: 899px) {
@@ -40,18 +37,15 @@ div#issue-merge-requests {
 }
 
 .merge-request-id {
-  display: block;
   color: #444;
 }
 
 .merge-request a {
-  display: block;
   font-weight: bold;
   margin: 4px 0;
 }
 
 .merge-request-state {
-  display: inline-block;
   background-color: #5aa51d;
   color: #fff;
   font-weight: bold;
@@ -69,7 +63,6 @@ div#issue-merge-requests {
 }
 
 .merge-request-by-line {
-  display: block;
   color: #888;
 }
 
diff --git a/db/migrate/20200827093954_add_timestamps_to_merge_request.rb b/db/migrate/20200827093954_add_timestamps_to_merge_request.rb
new file mode 100644
index 0000000..0307017
--- /dev/null
+++ b/db/migrate/20200827093954_add_timestamps_to_merge_request.rb
@@ -0,0 +1,7 @@
+class AddTimestampsToMergeRequest < ActiveRecord::Migration[5.2]
+  def change
+    change_table :merge_requests do |t|
+      t.timestamps
+    end
+  end
+end
diff --git a/lib/redmine_merge_request_links/hooks.rb b/lib/redmine_merge_request_links/hooks.rb
index 846fc8d..3a2a38d 100644
--- a/lib/redmine_merge_request_links/hooks.rb
+++ b/lib/redmine_merge_request_links/hooks.rb
@@ -5,7 +5,6 @@ def view_layouts_base_html_head(_context = {})
                           plugin: 'redmine_merge_request_links')
     end
 
-    render_on(:view_issues_show_after_details,
-              partial: 'merge_request_links/box')
+    render_on(:view_issues_show_description_bottom, partial: 'merge_request_links/box')
   end
 end