diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-25 09:09:10 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-25 09:09:10 +0000 |
| commit | b98fa9ef3d5bead417ae2f325cb64637883264e9 (patch) | |
| tree | 409f2002dd056f12d82d3959b3e6f012c4087123 /app/controllers/concerns/snippets_actions.rb | |
| parent | 7e3005967df23a957fe1998c8de4f50b412e69e7 (diff) | |
| download | gitlab-ce-b98fa9ef3d5bead417ae2f325cb64637883264e9.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/concerns/snippets_actions.rb')
| -rw-r--r-- | app/controllers/concerns/snippets_actions.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/controllers/concerns/snippets_actions.rb b/app/controllers/concerns/snippets_actions.rb index 014232a7d05..bb46345d362 100644 --- a/app/controllers/concerns/snippets_actions.rb +++ b/app/controllers/concerns/snippets_actions.rb @@ -6,20 +6,18 @@ module SnippetsActions def edit end - # rubocop:disable Gitlab/ModuleWithInstanceVariables def raw disposition = params[:inline] == 'false' ? 'attachment' : 'inline' workhorse_set_content_type! send_data( - convert_line_endings(@snippet.content), + convert_line_endings(blob.data), type: 'text/plain; charset=utf-8', disposition: disposition, - filename: @snippet.sanitized_file_name + filename: Snippet.sanitized_file_name(blob.name) ) end - # rubocop:enable Gitlab/ModuleWithInstanceVariables def js_request? request.format.js? |