diff options
| author | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2015-04-20 16:14:19 +0200 |
|---|---|---|
| committer | Jeroen van Baarsen <jeroenvanbaarsen@gmail.com> | 2015-04-20 16:14:19 +0200 |
| commit | 3f73d611cb7f80aafffd5b4526eb0faeebf624f6 (patch) | |
| tree | f87ac47a9d14849659a8a40a53576080593b0670 /app/controllers/projects_controller.rb | |
| parent | 76aade28e25d1f6e8924b35ed9bd365c8889987f (diff) | |
| parent | 5a4ebfb47af40de6cfe29fe59dae82f8c244e5e3 (diff) | |
| download | gitlab-ce-3f73d611cb7f80aafffd5b4526eb0faeebf624f6.tar.gz | |
Merge pull request #9145 from jvanbaarsen/before-action-rubocop
Fixed the Rails/ActionFilter cop
Diffstat (limited to 'app/controllers/projects_controller.rb')
| -rw-r--r-- | app/controllers/projects_controller.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 0f28794b736..1422f2b8a4c 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -1,13 +1,13 @@ class ProjectsController < ApplicationController prepend_before_filter :render_go_import, only: [:show] - skip_before_filter :authenticate_user!, only: [:show] - before_filter :project, except: [:new, :create] - before_filter :repository, except: [:new, :create] + skip_before_action :authenticate_user!, only: [:show] + before_action :project, except: [:new, :create] + before_action :repository, except: [:new, :create] # Authorize - before_filter :authorize_admin_project!, only: [:edit, :update, :destroy, :transfer, :archive, :unarchive] - before_filter :set_title, only: [:new, :create] - before_filter :event_filter, only: :show + before_action :authorize_admin_project!, only: [:edit, :update, :destroy, :transfer, :archive, :unarchive] + before_action :set_title, only: [:new, :create] + before_action :event_filter, only: :show layout 'navless', only: [:new, :create, :fork] |