summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2014-08-06 14:27:22 +0200
committerJacob Vosmaer <contact@jacobvosmaer.nl>2014-08-06 14:27:22 +0200
commit11d5ad2f17ed487ac10414c16480a23cedf60d3c (patch)
tree9618f4ad105b41c9fe58d48e68efe081f6bd95f3
parent352af72f434046b1c1562641f904b4d20fe7ef54 (diff)
downloadgitlab-ce-11d5ad2f17ed487ac10414c16480a23cedf60d3c.tar.gz
Make file edit error message less specific
The truth is that at the point where there error message is written we can only guess what went wrong.
-rw-r--r--app/services/files/update_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/files/update_service.rb b/app/services/files/update_service.rb
index c631f28749c..cbd441122dc 100644
--- a/app/services/files/update_service.rb
+++ b/app/services/files/update_service.rb
@@ -33,7 +33,7 @@ module Files
if created_successfully
success
else
- error("Your changes could not be committed, because the file has been changed")
+ error("Your changes could not be committed. Maybe the file changed, or there was nothing to commit?")
end
end
end