diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-24 00:06:29 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-24 00:06:29 +0300 |
commit | b9254657872c4db441ab268154686f5476fb4bc6 (patch) | |
tree | ab045c623296a049d1246ba2d66800456a1077aa /app/services/boards/lists | |
parent | c792263edfaf826c58f4aa41d26904464a17a3e7 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/boards/lists')
-rw-r--r-- | app/services/boards/lists/update_service.rb | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/app/services/boards/lists/update_service.rb b/app/services/boards/lists/update_service.rb index 2ddeb6f0bd8..ad96e42f756 100644 --- a/app/services/boards/lists/update_service.rb +++ b/app/services/boards/lists/update_service.rb @@ -4,10 +4,10 @@ module Boards module Lists class UpdateService < Boards::BaseService def execute(list) - return not_authorized if preferences? && !can_read?(list) - return not_authorized if position? && !can_admin?(list) + update_preferences_result = update_preferences(list) if can_read?(list) + update_position_result = update_position(list) if can_admin?(list) - if update_preferences(list) || update_position(list) + if update_preferences_result || update_position_result success(list: list) else error(list.errors.messages, 422) @@ -32,10 +32,6 @@ module Boards { collapsed: Gitlab::Utils.to_boolean(params[:collapsed]) } end - def not_authorized - error("Not authorized", 403) - end - def preferences? params.has_key?(:collapsed) end |