diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-05-02 15:25:26 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-05-02 15:25:26 +0000 |
commit | c5dee301f8bb6496c09c2aef54f9665b350c535f (patch) | |
tree | ae6354684944ff91413a5c2cceb9126014aff893 /app/controllers/snippets_controller.rb | |
parent | d32ecb23eb10065b1cc5eea95f4271ef402f0059 (diff) | |
parent | 0ca6ff67e438a8218ac53edd6280041d2f4b7a9c (diff) | |
download | gitlab-ce-c5dee301f8bb6496c09c2aef54f9665b350c535f.tar.gz |
Merge branch 'dm-snippet-download-button' into 'master'
Add download button to project snippets
See merge request !11004
Diffstat (limited to 'app/controllers/snippets_controller.rb')
-rw-r--r-- | app/controllers/snippets_controller.rb | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/app/controllers/snippets_controller.rb b/app/controllers/snippets_controller.rb index e338db8353b..da1ae9a34d9 100644 --- a/app/controllers/snippets_controller.rb +++ b/app/controllers/snippets_controller.rb @@ -6,10 +6,10 @@ class SnippetsController < ApplicationController include MarkdownPreview include RendersBlob - before_action :snippet, only: [:show, :edit, :destroy, :update, :raw, :download] + before_action :snippet, only: [:show, :edit, :destroy, :update, :raw] # Allow read snippet - before_action :authorize_read_snippet!, only: [:show, :raw, :download] + before_action :authorize_read_snippet!, only: [:show, :raw] # Allow modify snippet before_action :authorize_update_snippet!, only: [:edit, :update] @@ -17,7 +17,7 @@ class SnippetsController < ApplicationController # Allow destroy snippet before_action :authorize_admin_snippet!, only: [:destroy] - skip_before_action :authenticate_user!, only: [:index, :show, :raw, :download] + skip_before_action :authenticate_user!, only: [:index, :show, :raw] layout 'snippets' respond_to :html @@ -89,14 +89,6 @@ class SnippetsController < ApplicationController redirect_to snippets_path end - def download - send_data( - convert_line_endings(@snippet.content), - type: 'text/plain; charset=utf-8', - filename: @snippet.sanitized_file_name - ) - end - def preview_markdown render_markdown_preview(params[:text], skip_project_check: true) end |