Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeinrich Lee Yu <heinrich@gitlab.com>2019-06-11 13:40:01 +0300
committerHeinrich Lee Yu <heinrich@gitlab.com>2019-06-25 04:31:23 +0300
commit275a17589c2d468d8671a9f754a50b212273d509 (patch)
treefb491229331aa09e74fd14385b0682e693774395 /lib/gitlab/time_tracking_formatter.rb
parent4e283ee706b11fd3b918230976addc9a70603ce6 (diff)
Rename to time_tracking_limit_to_hours
Changes migration and all other places the attribute is used
Diffstat (limited to 'lib/gitlab/time_tracking_formatter.rb')
-rw-r--r--lib/gitlab/time_tracking_formatter.rb11
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/gitlab/time_tracking_formatter.rb b/lib/gitlab/time_tracking_formatter.rb
index a63fe51eb97..302da91328a 100644
--- a/lib/gitlab/time_tracking_formatter.rb
+++ b/lib/gitlab/time_tracking_formatter.rb
@@ -6,7 +6,7 @@ module Gitlab
def parse(string)
with_custom_config do
- string.sub!(/\A-/, '')
+ string = string.sub(/\A-/, '')
seconds = ChronicDuration.parse(string, default_unit: 'hours') rescue nil
seconds *= -1 if seconds && Regexp.last_match
@@ -16,11 +16,12 @@ module Gitlab
def output(seconds)
with_custom_config do
- limit_to_hours = Gitlab::CurrentSettings.time_tracking_display_hours_only
- ChronicDuration.output(seconds, format: :short, limit_to_hours: limit_to_hours, weeks: true) rescue nil
+ ChronicDuration.output(seconds, format: :short, limit_to_hours: limit_to_hours_setting, weeks: true) rescue nil
end
end
+ private
+
def with_custom_config
# We may want to configure it through project settings in a future version.
ChronicDuration.hours_per_day = 8
@@ -33,5 +34,9 @@ module Gitlab
result
end
+
+ def limit_to_hours_setting
+ Gitlab::CurrentSettings.time_tracking_limit_to_hours
+ end
end
end