Commit c9f585a6 authored by Steve Azzopardi's avatar Steve Azzopardi

Resolve conflicts in app/controllers/projects_controller.rb

Resolve conflicts for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8634
parent 024e7729
......@@ -6,12 +6,9 @@ class ProjectsController < Projects::ApplicationController
include ExtractsPath
include PreviewMarkdown
include SendFileUpload
<<<<<<< HEAD
=======
prepend_before_action(only: [:show]) { authenticate_sessionless_user!(:rss) }
>>>>>>> upstream/master
before_action :whitelist_query_limiting, only: [:create]
before_action :authenticate_user!, except: [:index, :show, :activity, :refs]
before_action :redirect_git_extension, only: [:show]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment