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:
authorDouwe Maan <douwe@selenight.nl>2017-04-06 18:05:57 +0300
committerDouwe Maan <douwe@selenight.nl>2017-04-06 18:51:45 +0300
commitcc656a11992483911cefe035d579096581cfde57 (patch)
tree5af4a41d9ae36b3900fdfa0b312b125995c8818c /app/services/issues
parent64c1735c22871d94e0bda8b9f5aece2a29739236 (diff)
Refactor resolvability checks based on type
Diffstat (limited to 'app/services/issues')
-rw-r--r--app/services/issues/build_service.rb8
1 files changed, 5 insertions, 3 deletions
diff --git a/app/services/issues/build_service.rb b/app/services/issues/build_service.rb
index 7b5858a8ccb..3a4f7b159f1 100644
--- a/app/services/issues/build_service.rb
+++ b/app/services/issues/build_service.rb
@@ -36,12 +36,14 @@ module Issues
def item_for_discussion(discussion)
first_note_to_resolve = discussion.first_note_to_resolve || discussion.first_note
- other_note_count = discussion.notes.size - 1
- note_url = Gitlab::UrlBuilder.build(first_note_to_resolve)
is_very_first_note = first_note_to_resolve == discussion.first_note
action = is_very_first_note ? "started" : "commented on"
-
+
+ note_url = Gitlab::UrlBuilder.build(first_note_to_resolve)
+
+ other_note_count = discussion.notes.size - 1
+
discussion_info = "- [ ] #{first_note_to_resolve.author.to_reference} #{action} a [discussion](#{note_url}): "
discussion_info << " (+#{other_note_count} #{'comment'.pluralize(other_note_count)})" if other_note_count > 0