diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-31 00:08:01 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-31 00:08:01 +0300 |
| commit | 95ad46159e4cd93f2b31838199180d824e041994 (patch) | |
| tree | d41880d3b6a0093463694978590e590efb08caef /app/services | |
| parent | 2c72daf2f1744f2b8c8c6674c266907e9ef55558 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/issuable/bulk_update_service.rb | 2 | ||||
| -rw-r--r-- | app/services/issuable_base_service.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/services/issuable/bulk_update_service.rb b/app/services/issuable/bulk_update_service.rb index bbb3c2ad050..2cd0e1e992d 100644 --- a/app/services/issuable/bulk_update_service.rb +++ b/app/services/issuable/bulk_update_service.rb @@ -21,7 +21,7 @@ module Issuable params.delete(key) unless params[key].present? end - if params[:assignee_ids] == [IssuableFinder::NONE.to_s] + if params[:assignee_ids] == [IssuableFinder::Params::NONE.to_s] params[:assignee_ids] = [] end diff --git a/app/services/issuable_base_service.rb b/app/services/issuable_base_service.rb index 830afbf4a43..506f4309a1e 100644 --- a/app/services/issuable_base_service.rb +++ b/app/services/issuable_base_service.rb @@ -46,7 +46,7 @@ class IssuableBaseService < BaseService assignee_ids = params[:assignee_ids].select { |assignee_id| assignee_can_read?(issuable, assignee_id) } - if params[:assignee_ids].map(&:to_s) == [IssuableFinder::NONE] + if params[:assignee_ids].map(&:to_s) == [IssuableFinder::Params::NONE] params[:assignee_ids] = [] elsif assignee_ids.any? params[:assignee_ids] = assignee_ids @@ -70,7 +70,7 @@ class IssuableBaseService < BaseService milestone_id = params[:milestone_id] return unless milestone_id - params[:milestone_id] = '' if milestone_id == IssuableFinder::NONE + params[:milestone_id] = '' if milestone_id == IssuableFinder::Params::NONE groups = project.group&.self_and_ancestors&.select(:id) milestone = |