1 files changed, 10 insertions, 13 deletions

diff --git a/app/services/issues/build_service.rb b/app/services/issues/build_service.rb
index 3145739fe91..5cb138946d7 100644
--- a/app/services/issues/build_service.rb
+++ b/app/services/issues/build_service.rb
@@ -64,20 +64,17 @@ module Issues
 
     private
 
-    def allowed_issue_base_params
-      [:title, :description, :confidential, :issue_type]
-    end
+    def allowed_issue_params
+      allowed_params = [
+        :title,
+        :description,
+        :confidential
+      ]
 
-    def allowed_issue_admin_params
-      [:milestone_id]
-    end
+      allowed_params << :milestone_id if can?(current_user, :admin_issue, project)
+      allowed_params << :issue_type if issue_type_allowed?(project)
 
-    def allowed_issue_params
-      if can?(current_user, :admin_issue, project)
-        params.slice(*(allowed_issue_base_params + allowed_issue_admin_params))
-      else
-        params.slice(*allowed_issue_base_params)
-      end
+      params.slice(*allowed_params)
     end
 
     def build_issue_params
@@ -88,4 +85,4 @@ module Issues
   end
 end
 
-Issues::BuildService.prepend_if_ee('EE::Issues::BuildService')
+Issues::BuildService.prepend_mod_with('Issues::BuildService')