diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2017-05-04 15:45:19 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-04 15:45:19 -0400 |
| commit | 49481caf6db89b0853626ac52ab5f786a6887179 (patch) | |
| tree | 128991892f16d7830097c217db689410a002eb73 /app/file.go | |
| parent | 44a8f76d993cdd97785cab7fd55ad9f07c3c757a (diff) | |
| download | chat-49481caf6db89b0853626ac52ab5f786a6887179.tar.gz chat-49481caf6db89b0853626ac52ab5f786a6887179.tar.bz2 chat-49481caf6db89b0853626ac52ab5f786a6887179.zip | |
PLT-6262 Add config setting to disable file attachments (#6301)
* Add config setting to disable file attachments
* Add unit tests
* Updating UI for no attachments (#6312)
* Update UI text on file upload System Console setting (#6313)
* Update storage_settings.jsx
* Update en.json
Diffstat (limited to 'app/file.go')
| -rw-r--r-- | app/file.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/file.go b/app/file.go index c5e2982d4..ad58de623 100644 --- a/app/file.go +++ b/app/file.go @@ -84,7 +84,7 @@ func ReadFile(path string) ([]byte, *model.AppError) { return f, nil } } else { - return nil, model.NewLocAppError("ReadFile", "api.file.read_file.configured.app_error", nil, "") + return nil, model.NewAppError("ReadFile", "api.file.read_file.configured.app_error", nil, "", http.StatusNotImplemented) } } |