summaryrefslogtreecommitdiff
path: root/app/controllers/projects/issues_controller.rb
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2017-06-29 11:43:47 +0100
committerNick Thomas <nick@gitlab.com>2017-06-29 22:38:29 +0100
commitdfcf1b5a44a544ed4b253d88dffac0d35c576211 (patch)
treea000966e4a38ec32e08a2ba81fbf7b68d8966b1a /app/controllers/projects/issues_controller.rb
parentdba763322c13b31b6ffe1410a031e40ad1b13365 (diff)
downloadgitlab-ce-dfcf1b5a44a544ed4b253d88dffac0d35c576211.tar.gz
Backport changes to Projects::IssuesController and the search bar
Diffstat (limited to 'app/controllers/projects/issues_controller.rb')
-rw-r--r--app/controllers/projects/issues_controller.rb20
1 files changed, 16 insertions, 4 deletions
diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb
index dfc6baa34a4..ca483c105b6 100644
--- a/app/controllers/projects/issues_controller.rb
+++ b/app/controllers/projects/issues_controller.rb
@@ -267,10 +267,22 @@ class Projects::IssuesController < Projects::ApplicationController
end
def issue_params
- params.require(:issue).permit(
- :title, :assignee_id, :position, :description, :confidential,
- :milestone_id, :due_date, :state_event, :task_num, :lock_version, label_ids: [], assignee_ids: []
- )
+ params.require(:issue).permit(*issue_params_attributes)
+ end
+
+ def issue_params_attributes
+ %i[
+ title
+ assignee_id
+ position
+ description
+ confidential
+ milestone_id
+ due_date
+ state_event
+ task_num
+ lock_version
+ ] + [{ label_ids: [], assignee_ids: [] }]
end
def authenticate_user!