diff options
| author | Job van der Voort <job@gitlab.com> | 2015-09-12 12:59:57 +0000 |
|---|---|---|
| committer | Job van der Voort <job@gitlab.com> | 2015-09-12 12:59:57 +0000 |
| commit | d6697bbd94fd74a246753da0f03b19af2dd4694f (patch) | |
| tree | 98680e0f91ec37c488f58c21c260619f4232762f | |
| parent | 5fcfba2780a9e5410b0a617aac67c0c45d944053 (diff) | |
| parent | 001738e992515400453abd7575493e382e5d1e0f (diff) | |
| download | gitlab-ce-d6697bbd94fd74a246753da0f03b19af2dd4694f.tar.gz | |
Merge branch 'improve-error-message' into 'master'
Improve english of error message
See merge request !1284
| -rw-r--r-- | app/services/files/create_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/files/create_service.rb b/app/services/files/create_service.rb index 91d715b2d63..c2da0c30bad 100644 --- a/app/services/files/create_service.rb +++ b/app/services/files/create_service.rb @@ -22,7 +22,7 @@ module Files blob = repository.blob_at_branch(@current_branch, @file_path) if blob - raise_error("Your changes could not be committed, because file with such name exists") + raise_error("Your changes could not be committed because a file with the same name already exists") end end end |