Merge branch 'properly-pluralize-offset-hours-in-teammate-danger' into 'master'

Pluralize offset hours in Teammate::Danger

See merge request gitlab-org/gitlab!36283

lib/gitlab/danger/teammate.rb

@@ -72,8 +72,9 @@ module Gitlab
         return "same timezone as `@#{author.username}`" if diff.zero?
 
         ahead_or_behind = diff < 0 ? 'behind' : 'ahead'
+        pluralized_hours = pluralize(diff.abs, 'hour', 'hours')
 
-        "#{diff.abs} hours #{ahead_or_behind} `@#{author.username}`"
+        "#{pluralized_hours} #{ahead_or_behind} `@#{author.username}`"
       end
 
       def has_capability?(project, category, kind, labels)
@@ -95,6 +96,12 @@ module Gitlab
       def capabilities(project)
         Array(projects.fetch(project, []))
       end
+
+      def pluralize(count, singular, plural)
+        word = count == 1 || count.to_s =~ /^1(\.0+)?$/ ? singular : plural
+
+        "#{count || 0} #{word}"
+      end
     end
   end
 end

spec/lib/gitlab/danger/teammate_spec.rb

@@ -178,6 +178,8 @@ RSpec.describe Gitlab::Danger::Teammate do
           -10 | 2 | "12 hours behind `@mario`"
           2 | 4 | "2 hours behind `@mario`"
           4 | 2 | "2 hours ahead `@mario`"
+          2 | 3 | "1 hour behind `@mario`"
+          3 | 2 | "1 hour ahead `@mario`"
           2 | 2 | "same timezone as `@mario`"
         end