Merge branch 'fix-conflict-pluralized' into 'master'

FIX #35027 : conflict pluralized Closes #35027 See merge request !13051

Merge branch 'fix-conflict-pluralized' into 'master'
3f21d03f · Clement Ho · c07dfe66 · a8b33d7b · 3f21d03f
Commit 3f21d03f authored Jul 25, 2017 by Clement Ho
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

merge_conflict_store.js ...ssets/javascripts/merge_conflicts/merge_conflict_store.js +1 -1

No files found.
--- a/app/assets/javascripts/merge_conflicts/merge_conflict_store.js
+++ b/app/assets/javascripts/merge_conflicts/merge_conflict_store.js
@@ -175,7 +175,7 @@ import Cookies from 'js-cookie';

    getConflictsCountText() {
      const count = this.getConflictsCount();
-      const text = count ? 'conflicts' : 'conflict';
+      const text = count > 1 ? 'conflicts' : 'conflict';

      return `${count} ${text}`;
    },