summaryrefslogtreecommitdiff
path: root/app/controllers/concerns
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2019-07-09 11:46:16 +0000
committerSean McGivern <sean@gitlab.com>2019-07-09 11:46:16 +0000
commit14e2412ee4969d7b4124ebedbc2dd76eb0ebda47 (patch)
tree9dc20e20231713aa00fbaae2e46d976fee52d245 /app/controllers/concerns
parenta87e2c99dc3215b8caeb670a810aa6c41b733776 (diff)
downloadgitlab-ce-14e2412ee4969d7b4124ebedbc2dd76eb0ebda47.tar.gz
CE Port of Allow bulk update for group issues
This is a port MR for CE Original MR: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14141
Diffstat (limited to 'app/controllers/concerns')
-rw-r--r--app/controllers/concerns/issuable_actions.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/concerns/issuable_actions.rb b/app/controllers/concerns/issuable_actions.rb
index 065d2d3a4ec..6fa2f75be33 100644
--- a/app/controllers/concerns/issuable_actions.rb
+++ b/app/controllers/concerns/issuable_actions.rb
@@ -92,7 +92,7 @@ module IssuableActions
end
def bulk_update
- result = Issuable::BulkUpdateService.new(project, current_user, bulk_update_params).execute(resource_name)
+ result = Issuable::BulkUpdateService.new(current_user, bulk_update_params).execute(resource_name)
quantity = result[:count]
render json: { notice: "#{quantity} #{resource_name.pluralize(quantity)} updated" }
@@ -181,7 +181,7 @@ module IssuableActions
end
def authorize_admin_issuable!
- unless can?(current_user, :"admin_#{resource_name}", @project) # rubocop:disable Gitlab/ModuleWithInstanceVariables
+ unless can?(current_user, :"admin_#{resource_name}", parent)
return access_denied!
end
end