diff options
| author | Heinrich Lee Yu <hleeyu@gmail.com> | 2018-12-31 16:39:43 +0800 |
|---|---|---|
| committer | Heinrich Lee Yu <hleeyu@gmail.com> | 2019-01-07 11:16:58 +0800 |
| commit | e2698d5d7455d91fa94f9bbf1fc838f8cb142700 (patch) | |
| tree | 900a7abd2983a5a31843c25a13ce06898c1e02d6 /app/controllers | |
| parent | 63e9969ca3ac57839b78d9cc44bcf32bc9a45248 (diff) | |
| download | gitlab-ce-e2698d5d7455d91fa94f9bbf1fc838f8cb142700.tar.gz | |
Improve email messages
Also refactored cleanup view to use the same localized string
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/concerns/uploads_actions.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/concerns/uploads_actions.rb b/app/controllers/concerns/uploads_actions.rb index 5992ad5f1e1..3771c97fdc8 100644 --- a/app/controllers/concerns/uploads_actions.rb +++ b/app/controllers/concerns/uploads_actions.rb @@ -7,12 +7,12 @@ module UploadsActions UPLOAD_MOUNTS = %w(avatar attachment file logo header_logo favicon).freeze def create - link_to_file = UploadService.new(model, params[:file], uploader_class).execute.to_h + link_to_file = UploadService.new(model, params[:file], uploader_class).execute respond_to do |format| if link_to_file format.json do - render json: { link: link_to_file } + render json: { link: link_to_file.to_h } end else format.json do |