Merge branch 'move-merge-request-ee-helper-methods' into 'master'

Move merge requests EE helper methods

Closes #1721

See merge request gitlab-org/gitlab-ee!6461

app/helpers/merge_requests_helper.rb

 module MergeRequestsHelper
+  prepend EE::MergeRequestsHelper
+
   def new_mr_path_from_push_event(event)
     target_project = event.project.default_merge_request_target
     project_new_merge_request_path(
@@ -59,46 +61,6 @@ module MergeRequestsHelper
     )
   end
 
-  def render_items_list(items, separator = "and")
-    items_cnt = items.size
-
-    case items_cnt
-    when 1
-      items.first
-    when 2
-      "#{items.first} #{separator} #{items.last}"
-    else
-      last_item = items.pop
-      "#{items.join(", ")} #{separator} #{last_item}"
-    end
-  end
-
-  # This may be able to be removed with associated specs
-  def render_require_section(merge_request)
-    str = if merge_request.approvals_left == 1
-            "Requires one more approval"
-          else
-            "Requires #{merge_request.approvals_left} more approvals"
-          end
-
-    if merge_request.approvers_left.any?
-      more_approvals = merge_request.approvals_left - merge_request.approvers_left.count
-      approvers_names = merge_request.approvers_left.map(&:name)
-
-      str <<
-
-        if more_approvals > 0
-          " (from #{render_items_list(approvers_names + ["#{more_approvals} more"])})"
-        elsif more_approvals < 0
-          " (from #{render_items_list(approvers_names, "or")})"
-        else
-          " (from #{render_items_list(approvers_names)})"
-        end
-    end
-
-    str
-  end
-
   def format_mr_branch_names(merge_request)
     source_path = merge_request.source_project_path
     target_path = merge_request.target_project_path

ee/app/helpers/ee/merge_requests_helper.rb

+module EE
+  module MergeRequestsHelper
+    def render_items_list(items, separator = "and")
+      items_cnt = items.size
+
+      case items_cnt
+      when 1
+        items.first
+      when 2
+        "#{items.first} #{separator} #{items.last}"
+      else
+        last_item = items.pop
+        "#{items.join(", ")} #{separator} #{last_item}"
+      end
+    end
+
+    # This may be able to be removed with associated specs
+    def render_require_section(merge_request)
+      str = if merge_request.approvals_left == 1
+              "Requires one more approval"
+            else
+              "Requires #{merge_request.approvals_left} more approvals"
+            end
+
+      if merge_request.approvers_left.any?
+        more_approvals = merge_request.approvals_left - merge_request.approvers_left.count
+        approvers_names = merge_request.approvers_left.map(&:name)
+
+        str << approval_items(more_approvals, approvers_names)
+      end
+
+      str
+    end
+
+    def approval_items(more_approvals, approvers_names)
+      if more_approvals > 0
+        " (from #{render_items_list(approvers_names + ["#{more_approvals} more"])})"
+      elsif more_approvals < 0
+        " (from #{render_items_list(approvers_names, "or")})"
+      else
+        " (from #{render_items_list(approvers_names)})"
+      end
+    end
+  end
+end

ee/changelogs/unreleased/move-merge-request-ee-helper-methods.yml

+---
+title: Move merge requests EE helper methods
+merge_request: 6461
+author: George Tsiolis
+type: other