diff options
| author | Vinnie Okada <vokada@mrvinn.com> | 2014-12-07 20:25:58 -0700 |
|---|---|---|
| committer | Vinnie Okada <vokada@mrvinn.com> | 2014-12-07 20:25:58 -0700 |
| commit | 742e6eeed221489d5f35bdfde2e6ce55db75d25f (patch) | |
| tree | 710c01fbd18e81a7590819161434e19855e35a97 /app/controllers/snippets_controller.rb | |
| parent | 7a5072c5a8f03cd7342a5f8e74e1fde0250ce360 (diff) | |
| parent | bbf9953b99d59801c72dd7b9550ee149ca77bfcf (diff) | |
| download | gitlab-ce-742e6eeed221489d5f35bdfde2e6ce55db75d25f.tar.gz | |
Merge branch 'upstream-master' into markdown-preview
Conflicts:
spec/routing/project_routing_spec.rb
Diffstat (limited to 'app/controllers/snippets_controller.rb')
| -rw-r--r-- | app/controllers/snippets_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/snippets_controller.rb b/app/controllers/snippets_controller.rb index 30fb4c5552d..bf3312fedc8 100644 --- a/app/controllers/snippets_controller.rb +++ b/app/controllers/snippets_controller.rb @@ -9,7 +9,7 @@ class SnippetsController < ApplicationController before_filter :set_title - skip_before_filter :authenticate_user!, only: [:index, :user_index] + skip_before_filter :authenticate_user!, only: [:index, :user_index, :show, :raw] respond_to :html |