summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests/conflicts
diff options
context:
space:
mode:
authorAlfredo Sumaran <alfredo@gitlab.com>2016-10-04 03:24:44 -0500
committerAlfredo Sumaran <alfredo@gitlab.com>2016-10-13 14:16:35 -0500
commit4f76ff0ecd0d3b278f9722042b66d1767078ddd0 (patch)
treeee76d0fb112c63ccc97f8890f34c6badaa618bac /app/views/projects/merge_requests/conflicts
parentf947972dede2f8d68215555e4b4fd6e90a6bc437 (diff)
downloadgitlab-ce-4f76ff0ecd0d3b278f9722042b66d1767078ddd0.tar.gz
Use .some instead of .find for phantomjs compatibility
Diffstat (limited to 'app/views/projects/merge_requests/conflicts')
0 files changed, 0 insertions, 0 deletions