diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-11-21 18:13:07 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-11-22 13:44:13 +0100 |
| commit | efbe58c64d3e786e98ec817cc0f11695e56a4270 (patch) | |
| tree | 35ea686d6a3db2e09cf58ecde70287d2f83f7ea1 | |
| parent | e548c613346a09ba2fc8dfd6ed64da6628ec6a45 (diff) | |
| download | gitlab-ce-efbe58c64d3e786e98ec817cc0f11695e56a4270.tar.gz | |
Ensure Issuable respond to :total_time_spent before calling it
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -rw-r--r-- | app/models/concerns/issuable.rb | 2 | ||||
| -rw-r--r-- | app/services/issuable_base_service.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb index 35090181bd9..5742e912a21 100644 --- a/app/models/concerns/issuable.rb +++ b/app/models/concerns/issuable.rb @@ -270,7 +270,7 @@ module Issuable end end - if old_total_time_spent != total_time_spent + if self.respond_to?(:total_time_spent) && old_total_time_spent != total_time_spent changes[:total_time_spent] = [old_total_time_spent, total_time_spent] end diff --git a/app/services/issuable_base_service.rb b/app/services/issuable_base_service.rb index 39a7299ff60..1a755f1efd1 100644 --- a/app/services/issuable_base_service.rb +++ b/app/services/issuable_base_service.rb @@ -172,7 +172,7 @@ class IssuableBaseService < BaseService old_labels = issuable.labels.to_a old_mentioned_users = issuable.mentioned_users.to_a old_assignees = issuable.assignees.to_a - old_total_time_spent = issuable.total_time_spent + old_total_time_spent = issuable.total_time_spent if issuable.respond_to?(:total_time_spent) label_ids = process_label_ids(params, existing_label_ids: issuable.label_ids) params[:label_ids] = label_ids if labels_changing?(issuable.label_ids, label_ids) |