diff options
| author | Jeff Stubler <brunsa2@gmail.com> | 2015-11-12 09:05:29 -0600 |
|---|---|---|
| committer | Jeff Stubler <brunsa2@gmail.com> | 2015-11-12 09:05:29 -0600 |
| commit | 64ca9cf3e4a56a19f09160a91c5433d2ddb632cf (patch) | |
| tree | f114ab02adb4815058fe7b84a1527ac5ed7a597e /app/controllers/projects_controller.rb | |
| parent | e0c64fac68b4b3acc48300956146b85e03b426ce (diff) | |
| parent | 12b35c6fe85073d809a764d24b51937f63b9d098 (diff) | |
| download | gitlab-ce-64ca9cf3e4a56a19f09160a91c5433d2ddb632cf.tar.gz | |
Merge branch 'master' into diverging-branch-graphs
Diffstat (limited to 'app/controllers/projects_controller.rb')
| -rw-r--r-- | app/controllers/projects_controller.rb | 2 |
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] |