summaryrefslogtreecommitdiff
path: root/app/helpers/merge_requests_helper.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/helpers/merge_requests_helper.rb')
-rw-r--r--app/helpers/merge_requests_helper.rb15
1 files changed, 14 insertions, 1 deletions
diff --git a/app/helpers/merge_requests_helper.rb b/app/helpers/merge_requests_helper.rb
index abb7128470f..84a3802c72c 100644
--- a/app/helpers/merge_requests_helper.rb
+++ b/app/helpers/merge_requests_helper.rb
@@ -150,11 +150,20 @@ module MergeRequestsHelper
review_requested_count = review_requested_merge_requests_count
total_count = assigned_count + review_requested_count
- {
+ counts = {
assigned: assigned_count,
review_requested: review_requested_count,
total: total_count
}
+
+ if Feature.enabled?(:mr_attention_requests, default_enabled: :yaml)
+ attention_requested_count = attention_requested_merge_requests_count
+
+ counts[:attention_requested_count] = attention_requested_count
+ counts[:total] = attention_requested_count
+ end
+
+ counts
end
end
@@ -205,6 +214,10 @@ module MergeRequestsHelper
current_user.review_requested_open_merge_requests_count
end
+ def attention_requested_merge_requests_count
+ current_user.attention_requested_open_merge_requests_count
+ end
+
def default_suggestion_commit_message
@project.suggestion_commit_message.presence || Gitlab::Suggestions::CommitMessage::DEFAULT_SUGGESTION_COMMIT_MESSAGE
end