diff options
| author | Michael Kozono <mkozono@gmail.com> | 2017-09-05 17:10:30 -0700 |
|---|---|---|
| committer | Michael Kozono <mkozono@gmail.com> | 2017-09-06 12:07:21 -0700 |
| commit | a4b564b6200582b6d3700a5e77e0c11fc5cac011 (patch) | |
| tree | 0916319c37ebdaaea9b74c95c99b733bfad5336a /app/services | |
| parent | f25b5b7f8db05ec441574429e024c71893fa7c11 (diff) | |
| download | gitlab-ce-a4b564b6200582b6d3700a5e77e0c11fc5cac011.tar.gz | |
Refactor based on code review
Diffstat (limited to 'app/services')
| -rw-r--r-- | app/services/concerns/update_visibility_level.rb | 2 | ||||
| -rw-r--r-- | app/services/groups/update_service.rb | 2 | ||||
| -rw-r--r-- | app/services/projects/update_service.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/app/services/concerns/update_visibility_level.rb b/app/services/concerns/update_visibility_level.rb index f67b5474627..536fcc6acce 100644 --- a/app/services/concerns/update_visibility_level.rb +++ b/app/services/concerns/update_visibility_level.rb @@ -1,5 +1,5 @@ module UpdateVisibilityLevel - def visibility_level_allowed?(target, new_visibility) + def valid_visibility_level_change?(target, new_visibility) # check that user is allowed to set specified visibility_level if new_visibility && new_visibility.to_i != target.visibility_level unless can?(current_user, :change_visibility_level, target) && diff --git a/app/services/groups/update_service.rb b/app/services/groups/update_service.rb index 90da1b3d1fe..7955dc32d52 100644 --- a/app/services/groups/update_service.rb +++ b/app/services/groups/update_service.rb @@ -5,7 +5,7 @@ module Groups def execute reject_parent_id! - return false unless visibility_level_allowed?(group, params[:visibility_level]) + return false unless valid_visibility_level_change?(group, params[:visibility_level]) return false unless valid_share_with_group_lock_change? diff --git a/app/services/projects/update_service.rb b/app/services/projects/update_service.rb index b3d62c9b84d..cb4ffcab778 100644 --- a/app/services/projects/update_service.rb +++ b/app/services/projects/update_service.rb @@ -3,7 +3,7 @@ module Projects include UpdateVisibilityLevel def execute - unless visibility_level_allowed?(project, params[:visibility_level]) + unless valid_visibility_level_change?(project, params[:visibility_level]) return error('New visibility level not allowed!') end |