From cb405aa45dd5acf766797a7375043b6608d394f8 Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon Date: Wed, 26 Jul 2017 11:19:57 +0200 Subject: Refactor max_size method in update pages service As per review feedback https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/13072#note_35853177 --- app/services/projects/update_pages_service.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/services/projects/update_pages_service.rb b/app/services/projects/update_pages_service.rb index a819b799ff8..749a1cc56d8 100644 --- a/app/services/projects/update_pages_service.rb +++ b/app/services/projects/update_pages_service.rb @@ -130,9 +130,11 @@ module Projects end def max_size - current_application_settings.max_pages_size.megabytes.tap do |maximum| - return MAX_SIZE if maximum.zero? || maximum > MAX_SIZE - end + max_pages_size = current_application_settings.max_pages_size.megabytes + + return MAX_SIZE if max_pages_size.zero? + + [max_pages_size, MAX_SIZE].min end def tmp_path -- cgit v1.2.1