diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-04-16 13:56:16 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-04-16 13:56:16 +0300 |
| commit | cee3df6c249ffbdd3b5f81367d8d69deafa646d7 (patch) | |
| tree | 1a2e5362897d0433753bd54ca321d913dd2f5f8a /app/controllers/concerns | |
| parent | 4ed152e4ba7efede082a9c8884fd94f0a113e398 (diff) | |
| parent | 99f278f6fdf6e0577312afc3913a6bb376dfdd2b (diff) | |
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/concerns')
| -rw-r--r-- | app/controllers/concerns/snippets_actions.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/controllers/concerns/snippets_actions.rb b/app/controllers/concerns/snippets_actions.rb index 9095cc7f783..120614739aa 100644 --- a/app/controllers/concerns/snippets_actions.rb +++ b/app/controllers/concerns/snippets_actions.rb @@ -17,6 +17,10 @@ module SnippetsActions end # rubocop:enable Gitlab/ModuleWithInstanceVariables + def js_request? + request.format.js? + end + private def convert_line_endings(content) |