kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

FIX #35027 : conflict pluralized

Closes #35027

See merge request !13051
This commit is contained in:
Clement Ho 2017-07-25 17:23:52 +00:00
parent c07dfe668e a8b33d7b5d
commit 3f21d03f26
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/merge_conflicts/merge_conflict_store.js
View File

@ -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}`;
},