diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-11 15:08:52 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-11 15:08:52 +0300 |
commit | 9f5ac379c76c278ee9ee1662e26c4612b0a117bd (patch) | |
tree | 49cd59544c083678fefd1e77340ca5e2b6e3565c /app/services/design_management | |
parent | 7240fb1a06c9e1b254719426b1ac96ec2f00fe35 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/design_management')
-rw-r--r-- | app/services/design_management/move_designs_service.rb | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/app/services/design_management/move_designs_service.rb b/app/services/design_management/move_designs_service.rb index ca715b10351..129f93edf5e 100644 --- a/app/services/design_management/move_designs_service.rb +++ b/app/services/design_management/move_designs_service.rb @@ -16,7 +16,6 @@ module DesignManagement return error(:cannot_move) unless current_user.can?(:move_design, current_design) return error(:no_neighbors) unless neighbors.present? return error(:not_distinct) unless all_distinct? - return error(:not_adjacent) if any_in_gap? return error(:not_same_issue) unless all_same_issue? move_nulls_to_end @@ -54,12 +53,6 @@ module DesignManagement ids.uniq.size == ids.size end - def any_in_gap? - return false unless previous_design&.relative_position && next_design&.relative_position - - !previous_design.immediately_before?(next_design) - end - def all_same_issue? issue.designs.id_in(ids).count == ids.size end |