diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-04-16 10:56:16 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-04-16 10:56:16 +0000 |
| commit | cee3df6c249ffbdd3b5f81367d8d69deafa646d7 (patch) | |
| tree | 1a2e5362897d0433753bd54ca321d913dd2f5f8a /app/controllers/projects/snippets_controller.rb | |
| parent | 4ed152e4ba7efede082a9c8884fd94f0a113e398 (diff) | |
| parent | 99f278f6fdf6e0577312afc3913a6bb376dfdd2b (diff) | |
| download | gitlab-ce-cee3df6c249ffbdd3b5f81367d8d69deafa646d7.tar.gz | |
Merge branch '8088_embedded_snippets_support' into 'master'
Embedded Snippets Support
Closes #8088
See merge request gitlab-org/gitlab-ce!15695
Diffstat (limited to 'app/controllers/projects/snippets_controller.rb')
| -rw-r--r-- | app/controllers/projects/snippets_controller.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/controllers/projects/snippets_controller.rb b/app/controllers/projects/snippets_controller.rb index 7c19aa7bb23..208a1d19862 100644 --- a/app/controllers/projects/snippets_controller.rb +++ b/app/controllers/projects/snippets_controller.rb @@ -5,6 +5,8 @@ class Projects::SnippetsController < Projects::ApplicationController include SnippetsActions include RendersBlob + skip_before_action :verify_authenticity_token, only: [:show], if: :js_request? + before_action :check_snippets_available! before_action :snippet, only: [:show, :edit, :destroy, :update, :raw, :toggle_award_emoji, :mark_as_spam] @@ -71,6 +73,7 @@ class Projects::SnippetsController < Projects::ApplicationController format.json do render_blob_json(blob) end + format.js { render 'shared/snippets/show'} end end |