Blob Edit error 'Someone edited the file the same time you did....' no longer shown
Everyone can contribute. Help move this issue forward while earning points, leveling up and collecting rewards.
Summary
A merge conflict upon the simultaneous edit of a file in the single file editor used to elicit the error:
Someone edited the file the same time you did. Please check out %{link_start}the file %{icon}%{link_end } and make sure your changes will not unintentionally remove theirs.
But now only the following is shown:
An error occurred editing the blob
which is much less helpful.
Steps to reproduce
Using the single page editor, edit the same file under two different accounts. Error occurs upon saving.
What is the current bug behavior?
A less useful error message is presented. Note that the former error message is still in the code.
What is the expected correct behavior?
The more helpful message should be rendered.
Output of checks
This bug happens on GitLab.com
Results of GitLab environment info
Possible fixes
This is a regression most likely caused in !137641 (merged) by introduction of a catch that bypasses the former error handling in the view code.