summaryrefslogtreecommitdiff
path: root/app/controllers/projects_controller.rb
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2015-11-03 13:48:57 +0100
committerJacob Vosmaer <contact@jacobvosmaer.nl>2015-11-03 13:48:57 +0100
commit2674a14becba89bb6b5259cd0ff3e5b29b724325 (patch)
treee076fe55932b5a053f8f5858f5d824d6a06d2f4d /app/controllers/projects_controller.rb
parent63cafdb8e5f9481539beaf2b6eac11cf8148daf1 (diff)
parent86c0d8d28983c4f6abbcbf461e422b2fe5962847 (diff)
downloadgitlab-ce-2674a14becba89bb6b5259cd0ff3e5b29b724325.tar.gz
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into spread-runner-last-updated-atspread-runner-last-updated-at
Diffstat (limited to 'app/controllers/projects_controller.rb')
-rw-r--r--app/controllers/projects_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 05c7d3de8bc..00d13a83ce8 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -1,7 +1,7 @@
class ProjectsController < ApplicationController
include ExtractsPath
- prepend_before_filter :render_go_import, only: [:show]
+ prepend_before_action :render_go_import, only: [:show]
skip_before_action :authenticate_user!, only: [:show, :activity]
before_action :project, except: [:new, :create]
before_action :repository, except: [:new, :create]