diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-07-25 12:45:17 +0200 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2017-07-25 12:45:45 +0200 |
| commit | 77a6ec22ba9057154925a6484c05ae204423aacd (patch) | |
| tree | 1ae7a46e7410e950ef1fdc694df5d47cb2db3114 /app/services/projects/update_pages_service.rb | |
| parent | d95e6da0d582cd4b0d333b3b6a1bfa3a565b874e (diff) | |
| download | gitlab-ce-77a6ec22ba9057154925a6484c05ae204423aacd.tar.gz | |
Handle maximum pages artifacts size correctly
Diffstat (limited to 'app/services/projects/update_pages_service.rb')
| -rw-r--r-- | app/services/projects/update_pages_service.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/services/projects/update_pages_service.rb b/app/services/projects/update_pages_service.rb index e60b854f916..a819b799ff8 100644 --- a/app/services/projects/update_pages_service.rb +++ b/app/services/projects/update_pages_service.rb @@ -130,7 +130,9 @@ module Projects end def max_size - current_application_settings.max_pages_size.megabytes || MAX_SIZE + current_application_settings.max_pages_size.megabytes.tap do |maximum| + return MAX_SIZE if maximum.zero? || maximum > MAX_SIZE + end end def tmp_path |