Merge pull request #1574 from sharelatex/sk-ignore-external-updates-from-gitbridge

When a document is updated externally via git-bridge, don't show warning

GitOrigin-RevId: bede2fa0c555a597ac40e8680ff30a51da0ab429
This commit is contained in:
Simon Detheridge
2019-03-11 11:04:35 +00:00
committed by James Allen
parent 870f183595
commit 97145847ef
@@ -236,6 +236,12 @@ define([
if (this._ignoreExternalUpdates) {
return
}
if (
_.property(['meta', 'type'])(update) === 'external' &&
_.property(['meta', 'source'])(update) === 'git-bridge'
) {
return
}
return this.ide.showGenericMessageModal(
'Document Updated Externally',
'This document was just updated externally. Any recent changes you have made may have been overwritten. To see previous versions please look in the history.'