Define and display Merge#creator. Refs #5299

1 files changed, 6 insertions, 0 deletions

diff --git a/app/controllers/merges_controller.rb b/app/controllers/merges_controller.rb
index 26e2c2e3c..a95768139 100644
--- a/app/controllers/merges_controller.rb
+++ b/app/controllers/merges_controller.rb
@@ -15,6 +15,12 @@ class MergesController < ChouetteController
     Rails.logger.debug "Mergeables: #{@mergeable_referentials.inspect}"
   end
 
+  def build_resource
+    super.tap do |merge|
+      merge.creator = current_user.name
+    end
+  end
+
   # def build_resource
   #   @import ||= WorkbenchImport.new(*resource_params) do |import|
   #     import.workbench = parent