Merge branch 'ccr/extract_EE_code_5942' into 'master'

Extract EE specific files, closes #5942

Closes #5942

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

app/controllers/concerns/issuable_actions.rb

 module IssuableActions
+  prepend EE::IssuableActions
   extend ActiveSupport::Concern
 
   included do
@@ -7,6 +8,19 @@ module IssuableActions
     before_action :authorize_admin_issuable!, only: :bulk_update
   end
 
+  def permitted_keys
+    [
+      :issuable_ids,
+      :assignee_id,
+      :milestone_id,
+      :state_event,
+      :subscription_event,
+      label_ids: [],
+      add_label_ids: [],
+      remove_label_ids: []
+    ]
+  end
+
   def show
     respond_to do |format|
       format.html
@@ -140,25 +154,15 @@ module IssuableActions
   end
 
   def bulk_update_params
-    permitted_keys = [
-      :issuable_ids,
-      :assignee_id,
-      :milestone_id,
-      :state_event,
-      :subscription_event,
-      :weight,
-      label_ids: [],
-      add_label_ids: [],
-      remove_label_ids: []
-    ]
+    permitted_keys_array = permitted_keys.dup
 
     if resource_name == 'issue'
-      permitted_keys << { assignee_ids: [] }
+      permitted_keys_array << { assignee_ids: [] }
     else
-      permitted_keys.unshift(:assignee_id)
+      permitted_keys_array.unshift(:assignee_id)
     end
 
-    params.require(:update).permit(permitted_keys)
+    params.require(:update).permit(permitted_keys_array)
   end
 
   def resource_name

app/controllers/concerns/issuable_collections.rb

 module IssuableCollections
+  prepend EE::IssuableCollections
   extend ActiveSupport::Concern
   include SortingHelper
   include Gitlab::IssuableMetadata
@@ -140,8 +141,6 @@ module IssuableCollections
     when 'milestone_due_desc' then sort_value_milestone
     when 'downvotes_asc'      then sort_value_popularity
     when 'downvotes_desc'     then sort_value_popularity
-    when 'weight_asc'         then sort_value_weight
-    when 'weight_desc'        then sort_value_weight
     else value
     end
   end

ee/app/controllers/concerns/ee/issuable_actions.rb

+module EE
+  module IssuableActions
+    extend ActiveSupport::Concern
+    extend ::Gitlab::Utils::Override
+
+    EE_PERMITTED_KEYS = %w[
+        weight
+    ].freeze
+
+    override :permitted_keys
+    def permitted_keys
+      @permitted_keys ||= (super + EE_PERMITTED_KEYS).freeze
+    end
+  end
+end

ee/app/controllers/concerns/ee/issuable_collections.rb

+module EE
+  module IssuableCollections
+    extend ActiveSupport::Concern
+    extend ::Gitlab::Utils::Override
+
+    # Update old values to the actual ones.
+    override :update_cookie_value
+    def update_cookie_value(value)
+      if value == 'weight_asc' || value == 'weight_desc'
+        sort_value_weight
+      else
+        super
+      end
+    end
+  end
+end

ee/changelogs/unreleased/ccr-extract-EE-specific-files.yml

+title:  Extract EE specific files
+merge_request: !5771
+type: added