diff options
author | Douwe Maan <douwe@selenight.nl> | 2017-08-31 09:13:41 +0200 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2017-08-31 09:13:41 +0200 |
commit | 7c215dd23dfa942d6b83252403ce326df96ab3ea (patch) | |
tree | 52c2d7bfa1a11beac6bb135c6eb425dd22d2e320 /lib/api/boards.rb | |
parent | a540f55c6e8ff64f7284ec4194f4c16ca711c685 (diff) | |
parent | d6e956d3a89fbb7f1a503f152fe9a4e2ca931d85 (diff) | |
download | gitlab-ce-7c215dd23dfa942d6b83252403ce326df96ab3ea.tar.gz |
Merge branch 'master' into issue-discussions-refactor
Diffstat (limited to 'lib/api/boards.rb')
-rw-r--r-- | lib/api/boards.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/api/boards.rb b/lib/api/boards.rb index 5a2d7a681e3..0d11c5fc971 100644 --- a/lib/api/boards.rb +++ b/lib/api/boards.rb @@ -122,13 +122,13 @@ module API end delete "/lists/:list_id" do authorize!(:admin_list, user_project) - list = board_lists.find(params[:list_id]) - service = ::Boards::Lists::DestroyService.new(user_project, current_user) - - unless service.execute(list) - render_api_error!({ error: 'List could not be deleted!' }, 400) + destroy_conditionally!(list) do |list| + service = ::Boards::Lists::DestroyService.new(user_project, current_user) + unless service.execute(list) + render_api_error!({ error: 'List could not be deleted!' }, 400) + end end end end |