diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2017-07-25 20:23:52 +0300 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2017-07-25 20:23:52 +0300 |
| commit | 3f21d03f26a5c4540adc349b63f9982413f09ee3 (patch) | |
| tree | 8b31e18b6657b25638683ba46e4a9b982ae9c177 /app | |
| parent | c07dfe668e2f2245bd87754e4eed0821061733a8 (diff) | |
| parent | a8b33d7b5db99f47000316a8dc167106214ca4f8 (diff) | |
Merge branch 'fix-conflict-pluralized' into 'master'
FIX #35027 : conflict pluralized
Closes #35027
See merge request !13051
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/merge_conflicts/merge_conflict_store.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/merge_conflicts/merge_conflict_store.js b/app/assets/javascripts/merge_conflicts/merge_conflict_store.js index c4e379a4a0b..8be7314ded8 100644 --- 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}`; }, |