diff options
| author | Emilien Mottet <emilien.mottet@grenoble-inp.org> | 2017-07-24 17:04:54 +0200 |
|---|---|---|
| committer | Emilien Mottet <emilien.mottet@grenoble-inp.org> | 2017-07-24 17:11:12 +0200 |
| commit | a8b33d7b5db99f47000316a8dc167106214ca4f8 (patch) | |
| tree | 2620c4e0ed8cd8a16734021e4e904c064bf4ddcb /app/assets | |
| parent | c2c8d7ffabaeb6514f7bf15fb5330c8402d80333 (diff) | |
| download | gitlab-ce-a8b33d7b5db99f47000316a8dc167106214ca4f8.tar.gz | |
fix conflict pluralized
Diffstat (limited to 'app/assets')
| -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}`; }, |