diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-17 03:12:37 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-17 03:12:37 +0300 |
| commit | 049fd8333a1c87144f43680f69f472de89bb7743 (patch) | |
| tree | f04a0c0dc4aa142a46ac7544c9decc8af9083764 /app/models/todo.rb | |
| parent | f9e0126cad562c7199e26e84a1540df3bc849e55 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/todo.rb')
| -rw-r--r-- | app/models/todo.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/models/todo.rb b/app/models/todo.rb index d0a6d1d9e23..742b8fd2a9d 100644 --- a/app/models/todo.rb +++ b/app/models/todo.rb @@ -18,7 +18,7 @@ class Todo < ApplicationRecord DIRECTLY_ADDRESSED = 7 MERGE_TRAIN_REMOVED = 8 # This is an EE-only feature REVIEW_REQUESTED = 9 - ATTENTION_REQUIRED = 10 + ATTENTION_REQUESTED = 10 ACTION_NAMES = { ASSIGNED => :assigned, @@ -30,7 +30,7 @@ class Todo < ApplicationRecord UNMERGEABLE => :unmergeable, DIRECTLY_ADDRESSED => :directly_addressed, MERGE_TRAIN_REMOVED => :merge_train_removed, - ATTENTION_REQUIRED => :attention_required + ATTENTION_REQUESTED => :attention_requested }.freeze belongs_to :author, class_name: "User" @@ -191,8 +191,8 @@ class Todo < ApplicationRecord action == REVIEW_REQUESTED end - def attention_required? - action == ATTENTION_REQUIRED + def attention_requested? + action == ATTENTION_REQUESTED end def merge_train_removed? |