diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-09-19 01:25:23 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-09-19 01:29:32 +0800 |
| commit | 6a4ee9aa7140862075cafae1ddebd133eec52b5b (patch) | |
| tree | 9890bb5c906a0d6e207149ae5fe1df84d213fa7c /app/models/concerns/time_trackable.rb | |
| parent | 9ae92b8caa6c11d8860f86b7d6378062215d1b72 (diff) | |
| download | gitlab-ce-6a4ee9aa7140862075cafae1ddebd133eec52b5b.tar.gz | |
Allow simple ivar ||= form. Update accordingly
Diffstat (limited to 'app/models/concerns/time_trackable.rb')
| -rw-r--r-- | app/models/concerns/time_trackable.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/concerns/time_trackable.rb b/app/models/concerns/time_trackable.rb index 75f7c81fa4e..995fa98efac 100644 --- a/app/models/concerns/time_trackable.rb +++ b/app/models/concerns/time_trackable.rb @@ -4,7 +4,6 @@ # # Used by Issue and MergeRequest. # -# rubocop:disable Cop/ModuleWithInstanceVariables module TimeTrackable extend ActiveSupport::Concern @@ -21,6 +20,7 @@ module TimeTrackable has_many :timelogs, dependent: :destroy # rubocop:disable Cop/ActiveRecordDependent end + # rubocop:disable Cop/ModuleWithInstanceVariables def spend_time(options) @time_spent = options[:duration] @time_spent_user = options[:user] @@ -50,6 +50,7 @@ module TimeTrackable private + # rubocop:disable Cop/ModuleWithInstanceVariables def reset_spent_time timelogs.new(time_spent: total_time_spent * -1, user: @time_spent_user) end @@ -58,6 +59,7 @@ module TimeTrackable timelogs.new(time_spent: time_spent, user: @time_spent_user) end + # rubocop:disable Cop/ModuleWithInstanceVariables def check_negative_time_spent return if time_spent.nil? || time_spent == :reset |