Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
458b5a10
Commit
458b5a10
authored
May 31, 2018
by
Chantal Rollison
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Backport of 5942-extract-ee-specific-files
parent
68afa03a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
13 deletions
+17
-13
app/controllers/concerns/issuable_actions.rb
app/controllers/concerns/issuable_actions.rb
+17
-13
No files found.
app/controllers/concerns/issuable_actions.rb
View file @
458b5a10
...
@@ -7,6 +7,19 @@ module IssuableActions
...
@@ -7,6 +7,19 @@ module IssuableActions
before_action
:authorize_admin_issuable!
,
only: :bulk_update
before_action
:authorize_admin_issuable!
,
only: :bulk_update
end
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
def
show
respond_to
do
|
format
|
respond_to
do
|
format
|
format
.
html
format
.
html
...
@@ -140,24 +153,15 @@ module IssuableActions
...
@@ -140,24 +153,15 @@ module IssuableActions
end
end
def
bulk_update_params
def
bulk_update_params
permitted_keys
=
[
permitted_keys_array
=
permitted_keys
.
dup
:issuable_ids
,
:assignee_id
,
:milestone_id
,
:state_event
,
:subscription_event
,
label_ids:
[],
add_label_ids:
[],
remove_label_ids:
[]
]
if
resource_name
==
'issue'
if
resource_name
==
'issue'
permitted_keys
<<
{
assignee_ids:
[]
}
permitted_keys
_array
<<
{
assignee_ids:
[]
}
else
else
permitted_keys
.
unshift
(
:assignee_id
)
permitted_keys
_array
.
unshift
(
:assignee_id
)
end
end
params
.
require
(
:update
).
permit
(
permitted_keys
)
params
.
require
(
:update
).
permit
(
permitted_keys
_array
)
end
end
def
resource_name
def
resource_name
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment