diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-09-12 12:20:40 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-09-12 12:20:40 +0000 |
| commit | 91e90ae78b1a47a5add859cbffcca0de5a7deef5 (patch) | |
| tree | ef4eeb979a9a9edee4372309d6d900257d0b748a /app/models | |
| parent | eaabcb1fc673e9818d834b333832aad2b1f5edac (diff) | |
| parent | d96b0eac0303278d4f215770533d09a2aec7955b (diff) | |
| download | gitlab-ce-91e90ae78b1a47a5add859cbffcca0de5a7deef5.tar.gz | |
Merge branch 'housekeeping_settings' into 'master'
Allow to use same periods for housekeeping tasks
Closes #34981
See merge request !13711
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/application_setting.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb index aede9b5f9da..c0cc60d5ebf 100644 --- a/app/models/application_setting.rb +++ b/app/models/application_setting.rb @@ -137,11 +137,11 @@ class ApplicationSetting < ActiveRecord::Base validates :housekeeping_full_repack_period, presence: true, - numericality: { only_integer: true, greater_than: :housekeeping_incremental_repack_period } + numericality: { only_integer: true, greater_than_or_equal_to: :housekeeping_incremental_repack_period } validates :housekeeping_gc_period, presence: true, - numericality: { only_integer: true, greater_than: :housekeeping_full_repack_period } + numericality: { only_integer: true, greater_than_or_equal_to: :housekeeping_full_repack_period } validates :terminal_max_session_time, presence: true, |