From b98fa9ef3d5bead417ae2f325cb64637883264e9 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 25 Feb 2020 09:09:10 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/controllers/concerns/snippets_actions.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'app/controllers/concerns/snippets_actions.rb') 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? -- cgit v1.2.1