diff options
author | Jacopo <beschi.jacopo@gmail.com> | 2018-05-15 12:40:17 +0200 |
---|---|---|
committer | Jacopo <beschi.jacopo@gmail.com> | 2018-05-17 18:23:26 +0200 |
commit | e4adf0150b58d0b7f8437cbb9a3cb3ac8aa31bec (patch) | |
tree | 54c598a649baf877648be92b6502f26e24eae02e /app/models | |
parent | 3a1843f9470e8916d65e182f33c1e5f53b217140 (diff) | |
download | gitlab-ce-e4adf0150b58d0b7f8437cbb9a3cb3ac8aa31bec.tar.gz |
Fixes 500 error on /estimate BIG_VALUE
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/concerns/time_trackable.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/concerns/time_trackable.rb b/app/models/concerns/time_trackable.rb index 73fc5048dcf..1caf47072bc 100644 --- a/app/models/concerns/time_trackable.rb +++ b/app/models/concerns/time_trackable.rb @@ -53,6 +53,10 @@ module TimeTrackable Gitlab::TimeTrackingFormatter.output(time_estimate) end + def time_estimate=(val) + val.is_a?(Integer) ? super([val, Gitlab::Database::MAX_INT_VALUE].min) : super(val) + end + private def touchable? |